From 531b15022618b1e9f12cf696b2a2c2246e59f0f9 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Mon, 2 Oct 2017 13:12:42 -0700
Subject: [PATCH 01/71] *: delete go

we are rewriting this project in rust. the first step is deleting all
the old code.
---
 .gitignore                                    |   2 -
 .travis.yml                                   |  12 -
 CONTRIBUTING.md                               |  68 --
 DCO                                           |  36 -
 LICENSE                                       | 202 ------
 MAINTAINERS                                   |   1 -
 NEWS                                          | 110 ---
 NOTICE                                        |   5 -
 README.md                                     |  80 ---
 build                                         |  22 -
 internal/main.go                              | 263 -------
 internal/main_test.go                         |  37 -
 internal/providers/azure/azure.go             | 232 -------
 .../cloudStackConfigDrive/cloudstack.go       | 169 -----
 .../cloudStackMetadata/cloudstack.go          | 139 ----
 .../providers/digitalocean/digitalocean.go    | 276 --------
 internal/providers/ec2/ec2.go                 | 162 -----
 internal/providers/gce/gce.go                 | 146 ----
 internal/providers/metadata.go                | 125 ----
 .../providers/openstackMetadata/metadata.go   | 111 ---
 internal/providers/oracleoci/oracleoci.go     |  65 --
 internal/providers/packet/packet.go           | 224 ------
 .../vagrant_virtualbox/vagrant_virtualbox.go  |  89 ---
 internal/retry/client.go                      |  66 --
 .../coreos/update-ssh-keys/authorized_keys_d  |   1 -
 .../src/authorized_keys_d/as_user/as_user.c   | 204 ------
 .../src/authorized_keys_d/as_user/as_user.go  |  98 ---
 .../src/authorized_keys_d/as_user/as_user.h   |  41 --
 .../authorized_keys_d/authorized_keys_d.go    | 369 ----------
 .../authorized_keys_d_test.go                 | 654 ------------------
 .../coreos/update-ssh-keys/src/main.go        | 187 -----
 .../coreos/update-ssh-keys/src/main_test.go   |  23 -
 .../github.com/packethost/packngo/LICENSE.txt |  56 --
 .../packethost/packngo/metadata/metadata.go   | 153 ----
 test                                          |  29 -
 35 files changed, 4457 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 .travis.yml
 delete mode 100644 CONTRIBUTING.md
 delete mode 100644 DCO
 delete mode 100644 LICENSE
 delete mode 100644 MAINTAINERS
 delete mode 100644 NEWS
 delete mode 100644 NOTICE
 delete mode 100644 README.md
 delete mode 100755 build
 delete mode 100644 internal/main.go
 delete mode 100644 internal/main_test.go
 delete mode 100644 internal/providers/azure/azure.go
 delete mode 100644 internal/providers/cloudStackConfigDrive/cloudstack.go
 delete mode 100644 internal/providers/cloudStackMetadata/cloudstack.go
 delete mode 100644 internal/providers/digitalocean/digitalocean.go
 delete mode 100644 internal/providers/ec2/ec2.go
 delete mode 100644 internal/providers/gce/gce.go
 delete mode 100644 internal/providers/metadata.go
 delete mode 100644 internal/providers/openstackMetadata/metadata.go
 delete mode 100644 internal/providers/oracleoci/oracleoci.go
 delete mode 100644 internal/providers/packet/packet.go
 delete mode 100644 internal/providers/vagrant_virtualbox/vagrant_virtualbox.go
 delete mode 100644 internal/retry/client.go
 delete mode 120000 internal/vendor/github.com/coreos/update-ssh-keys/authorized_keys_d
 delete mode 100644 internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.c
 delete mode 100644 internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.go
 delete mode 100644 internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.h
 delete mode 100644 internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/authorized_keys_d.go
 delete mode 100644 internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/authorized_keys_d_test.go
 delete mode 100644 internal/vendor/github.com/coreos/update-ssh-keys/src/main.go
 delete mode 100644 internal/vendor/github.com/coreos/update-ssh-keys/src/main_test.go
 delete mode 100644 internal/vendor/github.com/packethost/packngo/LICENSE.txt
 delete mode 100644 internal/vendor/github.com/packethost/packngo/metadata/metadata.go
 delete mode 100755 test

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index d098fb6b..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/
-gopath/
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 9c11341c..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-language: go
-matrix:
-  include:
-    - go: 1.5
-      env: GO15VENDOREXPERIMENT=1
-    - go: 1.6
-
-install:
-  -
-
-script:
-  - ./test
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 7ad3b312..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# How to Contribute
-
-CoreOS projects are [Apache 2.0 licensed](LICENSE) and accept contributions via
-GitHub pull requests.  This document outlines some of the conventions on
-development workflow, commit message formatting, contact points and other
-resources to make it easier to get your contribution accepted.
-
-# Certificate of Origin
-
-By contributing to this project you agree to the Developer Certificate of
-Origin (DCO). This document was created by the Linux Kernel community and is a
-simple statement that you, as a contributor, have the legal right to make the
-contribution. See the [DCO](DCO) file for details.
-
-# Email and Chat
-
-The project currently uses the general CoreOS email list and IRC channel:
-- Email: [coreos-dev](https://groups.google.com/forum/#!forum/coreos-dev)
-- IRC: #[coreos](irc://irc.freenode.org:6667/#coreos) IRC channel on freenode.org
-
-## Getting Started
-
-- Fork the repository on GitHub
-- Read the [README](README.md) for build and test instructions
-- Play with the project, submit bugs, submit patches!
-
-## Contribution Flow
-
-This is a rough outline of what a contributor's workflow looks like:
-
-- Create a topic branch from where you want to base your work (usually master).
-- Make commits of logical units.
-- Make sure your commit messages are in the proper format (see below).
-- Push your changes to a topic branch in your fork of the repository.
-- Make sure the tests pass, and add any new tests as appropriate.
-- Submit a pull request to the original repository.
-
-Thanks for your contributions!
-
-### Format of the Commit Message
-
-We follow a rough convention for commit messages that is designed to answer two
-questions: what changed and why. The subject line should feature the what and
-the body of the commit should describe the why.
-
-```
-environment: write new keys in consistent order
-
-Go 1.3 randomizes the ordering of keys when iterating over a map.
-Sort the keys to make this ordering consistent.
-
-Fixes #38
-```
-
-The format can be described more formally as follows:
-
-```
-<subsystem>: <what changed>
-<BLANK LINE>
-<why this change was made>
-<BLANK LINE>
-<footer>
-```
-
-The first line is the subject and should be no longer than 70 characters, the
-second line is always blank, and other lines should be wrapped at 80 characters.
-This allows the message to be easier to read on GitHub as well as in various
-git tools.
diff --git a/DCO b/DCO
deleted file mode 100644
index 716561d5..00000000
--- a/DCO
+++ /dev/null
@@ -1,36 +0,0 @@
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-660 York Street, Suite 102,
-San Francisco, CA 94110 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index e06d2081..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/MAINTAINERS b/MAINTAINERS
deleted file mode 100644
index a7ebc5d9..00000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-Alex Crawford <alex.crawford@coreos.com> (@crawford)
diff --git a/NEWS b/NEWS
deleted file mode 100644
index b62a57d5..00000000
--- a/NEWS
+++ /dev/null
@@ -1,110 +0,0 @@
-26-Sep-2017 COREOS-METADATA v0.14.0
-
-  Features
-    - Add CloudStack network provider
-
-08-Sep-2017 COREOS-METADATA v0.13.0
-
-  Features
-
-    - Add CloudStack provider
-    - Add Oracle OCI provider
-
-30-Jun-2017 COREOS-METADATA v0.12.0
-
-  Features
-
-    - Support writing network units on Packet
-
-  Changes
-
-    - Change network unit priority from 00 to 10
-
-30-Jun-2017 COREOS-METADATA v0.11.0
-
-  Features
-
-    - Add COREOS_DIGITALOCEAN_REGION
-    - Add vagrant_virtualbox provider
-
-  Bug Fixes
-
-    - Properly fetch SSH keys on EC2
-    - Add trailing newlines to hostname and SSH key files
-
-23-May-2017 COREOS-METADATA v0.10.0
-
-  Features
-
-    - Add COREOS_EC2_REGION
-
-10-May-2017 COREOS-METADATA v0.9.0
-
-  Features
-
-    - Added COREOS_EC2_AVAILABILITY_ZONE to the ec2 provider
-
-17-Mar-2017 COREOS-METADATA v0.8.0
-
-  Features
-
-    - Expose Packet's phone-home URL
-
-10-Mar-2017 COREOS-METADATA v0.7.0
-
-  Features
-
-    - Add support for OpenStack-Metadata
-
-09-Nov-2016 COREOS-METADATA v0.6.2
-
-  Bug Fixes
-
-    - Properly handle missing IP addresses on GCE
-
-01-Nov-2016 COREOS-METADATA v0.6.1
-
-  Bug Fixes
-
-    - Wait for DHCP leases on Azure
-
-07-Sep-2016 COREOS-METADATA v0.6.0
-
-  Features
-
-    - Add support for DigitalOcean
-
-26-Jul-2016 COREOS-METADATA v0.5.0
-
-  Features
-
-    - Add support for Packet
-
-15-Jun-2016 COREOS-METADATA v0.4.1
-
-  Bug Fixes
-
-    - Properly handle missing metadata fields
-    - Do not output attribute when its value is nil
-
-  Features
-
-    - Include the EC2 instance ID in the list of attributes
-
-29-Apr-2016 COREOS-METADATA v0.4.0
-
-  Features
-
-    - Add support for writing SSH keys
-    - Add support for GCE
-
-  Changes
-
-    - Move to Go 1.5 and 1.6 and the new vendor/internal packages
-    - Renamed `--output` to `--attributes`
-
-24-Nov-2015 COREOS-METADATA v0.3.0
-
-  Changes
-
-    - Renamed all output variables to be provider specific
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index e520005c..00000000
--- a/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-CoreOS Project
-Copyright 2015 CoreOS, Inc
-
-This product includes software developed at CoreOS, Inc.
-(http://www.coreos.com/).
diff --git a/README.md b/README.md
deleted file mode 100644
index a726e00e..00000000
--- a/README.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# CoreOS Metadata
-
-This is a small utility, typically used in conjunction with [Ignition][ignition], which reads metadata from a given cloud-provider and applies it to the system. This can include adding SSH keys and writing cloud-specific attributes into an environment file. This file can then be consumed by systemd service units via `EnvironmentFile=`.
-
-## Support
-
-The supported cloud providers and their respective metadata are as follows:
-
-  - azure
-    - Attributes
-      - COREOS_AZURE_IPV4_DYNAMIC
-      - COREOS_AZURE_IPV4_VIRTUAL
-  - digitalocean
-    - SSH Keys
-    - Network Configs
-    - Attributes
-      - COREOS_DIGITALOCEAN_HOSTNAME
-      - COREOS_DIGITALOCEAN_IPV4_ANCHOR_0
-      - COREOS_DIGITALOCEAN_IPV4_PUBLIC_0
-      - COREOS_DIGITALOCEAN_IPV4_PRIVATE_0
-      - COREOS_DIGITALOCEAN_IPV6_PUBLIC_0
-      - COREOS_DIGITALOCEAN_IPV6_PRIVATE_0
-      - COREOS_DIGITALOCEAN_REGION
-  - ec2
-    - SSH Keys
-    - Attributes
-      - COREOS_EC2_HOSTNAME
-      - COREOS_EC2_IPV4_LOCAL
-      - COREOS_EC2_IPV4_PUBLIC
-      - COREOS_EC2_AVAILABILITY_ZONE
-      - COREOS_EC2_INSTANCE_ID
-      - COREOS_EC2_REGION
-  - gce
-    - SSH Keys
-    - Attributes
-      - COREOS_GCE_HOSTNAME
-      - COREOS_GCE_IP_EXTERNAL_0
-      - COREOS_GCE_IP_LOCAL_0
-  - packet
-    - SSH Keys
-    - Attributes
-      - COREOS_PACKET_HOSTNAME
-      - COREOS_PACKET_IPV4_PUBLIC_0
-      - COREOS_PACKET_IPV4_PRIVATE_0
-      - COREOS_PACKET_IPV6_PUBLIC_0
-  - openstack-metadata
-    - SSH Keys
-    - Attributes
-      - COREOS_OPENSTACK_HOSTNAME
-      - COREOS_OPENSTACK_IPV4_LOCAL
-      - COREOS_OPENSTACK_IPV4_PUBLIC
-      - COREOS_OPENSTACK_INSTANCE_ID
-  - cloudstack-configdrive
-    - SSH Keys
-    - Attributes
-      - COREOS_CLOUDSTACK_AVAILABILITY_ZONE
-      - COREOS_CLOUDSTACK_INSTANCE_ID
-      - COREOS_CLOUDSTACK_SERVICE_OFFERING
-      - COREOS_CLOUDSTACK_CLOUD_IDENTIFIER
-      - COREOS_CLOUDSTACK_LOCAL_HOSTNAME
-      - COREOS_CLOUDSTACK_VM_ID
-  - cloudstack-metadata
-    - SSH Keys
-    - Attributes
-      - COREOS_CLOUDSTACK_AVAILABILITY_ZONE
-      - COREOS_CLOUDSTACK_CLOUD_IDENTIFIER
-      - COREOS_CLOUDSTACK_HOSTNAME
-      - COREOS_CLOUDSTACK_INSTANCE_ID
-      - COREOS_CLOUDSTACK_IPV4_LOCAL
-      - COREOS_CLOUDSTACK_IPV4_PUBLIC
-      - COREOS_CLOUDSTACK_LOCAL_HOSTNAME
-      - COREOS_CLOUDSTACK_PUBLIC_HOSTNAME
-      - COREOS_CLOUDSTACK_SERVICE_OFFERING
-      - COREOS_CLOUDSTACK_VM_ID
-  - vagrant-virtualbox
-    - Attributes
-      - COREOS_VAGRANT_VIRTUALBOX_PRIVATE_IPV4
-      - COREOS_VAGRANT_VIRTUALBOX_HOSTNAME
-
-[ignition]: https://github.com/coreos/ignition
diff --git a/build b/build
deleted file mode 100755
index b12d15d8..00000000
--- a/build
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-NAME="coreos-metadata"
-ORG_PATH="github.com/coreos"
-REPO_PATH="${ORG_PATH}/${NAME}"
-VERSION=$(git describe --dirty)
-GLDFLAGS="-X main.version=\"${VERSION}\""
-
-if [ ! -h gopath/src/${REPO_PATH} ]; then
-	mkdir -p gopath/src/${ORG_PATH}
-	ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
-fi
-
-export GOBIN=${PWD}/bin
-export GOPATH=${PWD}/gopath
-
-eval $(go env)
-
-echo "Building ${NAME}..."
-go build -ldflags "${GLDFLAGS}" -o ${GOBIN}/${NAME} ${REPO_PATH}/internal
diff --git a/internal/main.go b/internal/main.go
deleted file mode 100644
index c54ec372..00000000
--- a/internal/main.go
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"errors"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/user"
-	"path/filepath"
-	"strings"
-
-	"github.com/coreos/coreos-metadata/internal/providers"
-	"github.com/coreos/coreos-metadata/internal/providers/azure"
-	"github.com/coreos/coreos-metadata/internal/providers/cloudStackConfigDrive"
-	"github.com/coreos/coreos-metadata/internal/providers/cloudStackMetadata"
-	"github.com/coreos/coreos-metadata/internal/providers/digitalocean"
-	"github.com/coreos/coreos-metadata/internal/providers/ec2"
-	"github.com/coreos/coreos-metadata/internal/providers/gce"
-	"github.com/coreos/coreos-metadata/internal/providers/openstackMetadata"
-	"github.com/coreos/coreos-metadata/internal/providers/oracleoci"
-	"github.com/coreos/coreos-metadata/internal/providers/packet"
-	"github.com/coreos/coreos-metadata/internal/providers/vagrant_virtualbox"
-
-	"github.com/coreos/update-ssh-keys/authorized_keys_d"
-)
-
-var (
-	version       = "was not built properly"
-	versionString = fmt.Sprintf("coreos-metadata %s", version)
-
-	ErrUnknownProvider = errors.New("unknown provider")
-)
-
-const (
-	cmdlinePath    = "/proc/cmdline"
-	cmdlineOEMFlag = "coreos.oem.id"
-)
-
-func main() {
-	flags := struct {
-		attributes   string
-		cmdline      bool
-		hostname     string
-		networkUnits string
-		provider     string
-		sshKeys      string
-		version      bool
-	}{}
-
-	flag.StringVar(&flags.attributes, "attributes", "", "The file into which the metadata attributes are written")
-	flag.BoolVar(&flags.cmdline, "cmdline", false, "Read the cloud provider from the kernel cmdline")
-	flag.StringVar(&flags.hostname, "hostname", "", "The file into which the hostname should be written")
-	flag.StringVar(&flags.networkUnits, "network-units", "", "The directory into which network units are written")
-	flag.StringVar(&flags.provider, "provider", "", "The name of the cloud provider")
-	flag.StringVar(&flags.sshKeys, "ssh-keys", "", "Update SSH keys for the given user")
-	flag.BoolVar(&flags.version, "version", false, "Print the version and exit")
-
-	flag.Parse()
-
-	if flags.version {
-		fmt.Println(versionString)
-		return
-	}
-
-	if flags.cmdline && flags.provider == "" {
-		args, err := ioutil.ReadFile(cmdlinePath)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "could not read cmdline: %v\n", err)
-			os.Exit(2)
-		}
-
-		flags.provider = parseCmdline(args)
-	}
-
-	metadataFn, err := getMetadataProvider(flags.provider)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "invalid provider %q\n", flags.provider)
-		os.Exit(2)
-	}
-
-	metadata, err := metadataFn()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "failed to fetch metadata: %v\n", err)
-		os.Exit(1)
-	}
-
-	if err := writeMetadataAttributes(flags.attributes, metadata); err != nil {
-		fmt.Fprintf(os.Stderr, "failed to write metadata attributes: %v\n", err)
-		os.Exit(1)
-	}
-
-	if err := writeMetadataKeys(flags.sshKeys, metadata); err != nil {
-		fmt.Fprintf(os.Stderr, "failed to write metadata keys: %v\n", err)
-		os.Exit(1)
-	}
-
-	if err := writeHostname(flags.hostname, metadata); err != nil {
-		fmt.Fprintf(os.Stderr, "failed to write hostname: %v\n", err)
-		os.Exit(1)
-	}
-
-	if err := writeNetworkUnits(flags.networkUnits, metadata); err != nil {
-		fmt.Fprintf(os.Stderr, "failed to write network units: %v\n", err)
-		os.Exit(1)
-	}
-}
-
-func parseCmdline(cmdline []byte) (oem string) {
-	for _, arg := range strings.Split(string(cmdline), " ") {
-		parts := strings.SplitN(strings.TrimSpace(arg), "=", 2)
-		key := parts[0]
-
-		if key != cmdlineOEMFlag {
-			continue
-		}
-
-		if len(parts) == 2 {
-			oem = parts[1]
-		}
-	}
-
-	return
-}
-
-func getMetadataProvider(providerName string) (func() (providers.Metadata, error), error) {
-	switch providerName {
-	case "azure":
-		return azure.FetchMetadata, nil
-	case "digitalocean":
-		return digitalocean.FetchMetadata, nil
-	case "ec2":
-		return ec2.FetchMetadata, nil
-	case "gce":
-		return gce.FetchMetadata, nil
-	case "packet":
-		return packet.FetchMetadata, nil
-	case "openstack-metadata":
-		return openstackMetadata.FetchMetadata, nil
-	case "vagrant-virtualbox":
-		return vagrant_virtualbox.FetchMetadata, nil
-	case "cloudstack-configdrive":
-		return cloudStackConfigDrive.FetchMetadata, nil
-	case "cloudstack-metadata":
-		return cloudStackMetadata.FetchMetadata, nil
-	case "oracle-oci":
-		return oracleoci.FetchMetadata, nil
-	default:
-		return nil, ErrUnknownProvider
-	}
-}
-
-func writeVariable(out *os.File, key string, value string) (err error) {
-	if len(value) > 0 {
-		_, err = fmt.Fprintf(out, "COREOS_%s=%s\n", key, value)
-	}
-	return
-}
-
-func writeMetadataAttributes(attributes string, metadata providers.Metadata) error {
-	if attributes == "" {
-		return nil
-	}
-
-	if err := os.MkdirAll(filepath.Dir(attributes), 0755); err != nil {
-		fmt.Fprintf(os.Stderr, "failed to create directory: %v\n", err)
-		os.Exit(1)
-	}
-
-	out, err := os.Create(attributes)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "failed to create file: %v\n", err)
-		os.Exit(1)
-	}
-	defer out.Close()
-
-	for key, value := range metadata.Attributes {
-		if err := writeVariable(out, key, value); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func writeMetadataKeys(username string, metadata providers.Metadata) error {
-	if username == "" || metadata.SshKeys == nil {
-		return nil
-	}
-
-	usr, err := user.Lookup(username)
-	if err != nil {
-		return fmt.Errorf("unable to lookup user %q: %v", username, err)
-	}
-
-	akd, err := authorized_keys_d.Open(usr, true)
-	if err != nil {
-		return err
-	}
-	defer akd.Close()
-
-	ks := strings.Join(metadata.SshKeys, "\n") + "\n"
-	if err := akd.Add("coreos-metadata", []byte(ks), true, true); err != nil {
-		return err
-	}
-
-	return akd.Sync()
-}
-
-func writeHostname(path string, metadata providers.Metadata) error {
-	if path == "" || metadata.Hostname == "" {
-		return nil
-	}
-
-	err := os.MkdirAll(filepath.Dir(path), 0755)
-	if err != nil {
-		return err
-	}
-
-	return ioutil.WriteFile(path, []byte(metadata.Hostname+"\n"), 0644)
-}
-
-func writeNetworkUnits(root string, metadata providers.Metadata) error {
-	if root == "" || metadata.Network == nil {
-		return nil
-	}
-
-	err := os.MkdirAll(root, 0755)
-	if err != nil {
-		return err
-	}
-
-	for _, iface := range metadata.Network {
-		name := filepath.Join(root, iface.UnitName())
-		err := ioutil.WriteFile(name, []byte(iface.NetworkConfig()), 0644)
-		if err != nil {
-			return err
-		}
-	}
-
-	for _, device := range metadata.NetDev {
-		name := filepath.Join(root, device.UnitName())
-		err := ioutil.WriteFile(name, []byte(device.NetdevConfig()), 0644)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/internal/main_test.go b/internal/main_test.go
deleted file mode 100644
index 7a665ad6..00000000
--- a/internal/main_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package main
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestGetMetadataProvider(t *testing.T) {
-	tests := []struct {
-		desc string
-		name string
-		err  error
-	}{
-		{
-			desc: "supported provider",
-			name: "digitalocean",
-			err:  nil,
-		},
-		{
-			desc: "unknown provider",
-			name: "not-supported",
-			err:  ErrUnknownProvider,
-		},
-		{
-			desc: "empty provider",
-			name: "",
-			err:  ErrUnknownProvider,
-		},
-	}
-
-	for _, tt := range tests {
-		_, err := getMetadataProvider(tt.name)
-		if !reflect.DeepEqual(err, tt.err) {
-			t.Errorf("%s:\nwant: %v\n got: %v", tt.desc, tt.err, err)
-		}
-	}
-}
diff --git a/internal/providers/azure/azure.go b/internal/providers/azure/azure.go
deleted file mode 100644
index dbf53d8e..00000000
--- a/internal/providers/azure/azure.go
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package azure
-
-import (
-	"bufio"
-	"encoding/xml"
-	"fmt"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/coreos/coreos-metadata/internal/providers"
-	"github.com/coreos/coreos-metadata/internal/retry"
-)
-
-const (
-	AgentName             = "com.coreos.metadata"
-	FabricProtocolVersion = "2012-11-30"
-	LeaseRetryInterval    = 500 * time.Millisecond
-)
-
-type metadata struct {
-	virtualIPv4 net.IP
-	dynamicIPv4 net.IP
-}
-
-func FetchMetadata() (providers.Metadata, error) {
-	addr, err := getFabricAddress()
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-
-	if err := assertFabricCompatible(addr, FabricProtocolVersion); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	config, err := fetchSharedConfig(addr)
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-
-	return providers.Metadata{
-		Attributes: map[string]string{
-			"AZURE_IPV4_DYNAMIC": providers.String(config.dynamicIPv4),
-			"AZURE_IPV4_VIRTUAL": providers.String(config.virtualIPv4),
-		},
-	}, nil
-}
-
-func getClient() retry.Client {
-	client := retry.Client{
-		InitialBackoff: time.Second,
-		MaxBackoff:     time.Second * 5,
-		MaxAttempts:    10,
-		Header: map[string][]string{
-			"x-ms-agent-name": {AgentName},
-			"x-ms-version":    {FabricProtocolVersion},
-			"Content-Type":    {"text/xml; charset=utf-8"},
-		},
-	}
-
-	return client
-}
-
-func findLease() (*os.File, error) {
-	ifaces, err := net.Interfaces()
-	if err != nil {
-		return nil, fmt.Errorf("could not list interfaces: %v", err)
-	}
-
-	for {
-		for _, iface := range ifaces {
-			lease, err := os.Open(fmt.Sprintf("/run/systemd/netif/leases/%d", iface.Index))
-			if os.IsNotExist(err) {
-				continue
-			} else if err != nil {
-				return nil, err
-			} else {
-				return lease, nil
-			}
-		}
-
-		fmt.Printf("No leases found. Waiting...")
-		time.Sleep(LeaseRetryInterval)
-	}
-}
-
-func getFabricAddress() (net.IP, error) {
-	lease, err := findLease()
-	if err != nil {
-		return nil, err
-	}
-	defer lease.Close()
-
-	var rawEndpoint string
-	line := bufio.NewScanner(lease)
-	for line.Scan() {
-		parts := strings.Split(line.Text(), "=")
-		if parts[0] == "OPTION_245" && len(parts) == 2 {
-			rawEndpoint = parts[1]
-			break
-		}
-	}
-
-	if len(rawEndpoint) == 0 || len(rawEndpoint) != 8 {
-		return nil, fmt.Errorf("fabric endpoint not found in leases")
-	}
-
-	octets := make([]byte, 4)
-	for i := 0; i < 4; i++ {
-		octet, err := strconv.ParseUint(rawEndpoint[2*i:2*i+2], 16, 8)
-		if err != nil {
-			return nil, err
-		}
-		octets[i] = byte(octet)
-	}
-
-	return net.IPv4(octets[0], octets[1], octets[2], octets[3]), nil
-}
-
-func assertFabricCompatible(endpoint net.IP, desiredVersion string) error {
-	body, err := getClient().Getf("http://%s/?comp=versions", endpoint)
-	if err != nil {
-		return fmt.Errorf("failed to fetch versions: %v", err)
-	}
-
-	versions := struct {
-		Supported struct {
-			Versions []string `xml:"Version"`
-		}
-		Preferred struct {
-			Version string
-		}
-	}{}
-
-	if err := xml.Unmarshal(body, &versions); err != nil {
-		return fmt.Errorf("failed to unmarshal response: %v", err)
-	}
-
-	for _, version := range versions.Supported.Versions {
-		if version == desiredVersion {
-			return nil
-		}
-	}
-
-	return fmt.Errorf("fabric version %s is not compatible", desiredVersion)
-}
-
-func fetchSharedConfig(endpoint net.IP) (metadata, error) {
-	client := getClient()
-
-	body, err := client.Getf("http://%s/machine/?comp=goalstate", endpoint)
-	if err != nil {
-		return metadata{}, fmt.Errorf("failed to fetch goal state: %v", err)
-	}
-
-	goal := struct {
-		Container struct {
-			RoleInstanceList struct {
-				RoleInstance struct {
-					Configuration struct {
-						SharedConfig string
-					}
-				}
-			}
-		}
-	}{}
-
-	if err := xml.Unmarshal(body, &goal); err != nil {
-		return metadata{}, fmt.Errorf("failed to unmarshal response: %v", err)
-	}
-
-	body, err = client.Get(goal.Container.RoleInstanceList.RoleInstance.Configuration.SharedConfig)
-	if err != nil {
-		return metadata{}, fmt.Errorf("failed to fetch shared config: %v", err)
-	}
-
-	sharedConfig := struct {
-		Incarnation struct {
-			Instance string `xml:"instance,attr"`
-		}
-		Instances struct {
-			Instances []struct {
-				Id             string `xml:"id,attr"`
-				Address        string `xml:"address,attr"`
-				InputEndpoints struct {
-					Endpoints []struct {
-						LoadBalancedPublicAddress string `xml:"loadBalancedPublicAddress,attr"`
-					} `xml:"Endpoint"`
-				}
-			} `xml:"Instance"`
-		}
-	}{}
-
-	if err := xml.Unmarshal(body, &sharedConfig); err != nil {
-		return metadata{}, err
-	}
-
-	config := metadata{}
-	for _, i := range sharedConfig.Instances.Instances {
-		if i.Id == sharedConfig.Incarnation.Instance {
-			config.dynamicIPv4 = net.ParseIP(i.Address)
-
-			for _, e := range i.InputEndpoints.Endpoints {
-				host, _, err := net.SplitHostPort(e.LoadBalancedPublicAddress)
-				if err == nil {
-					config.virtualIPv4 = net.ParseIP(host)
-					break
-				}
-			}
-
-			break
-		}
-	}
-
-	return config, nil
-}
diff --git a/internal/providers/cloudStackConfigDrive/cloudstack.go b/internal/providers/cloudStackConfigDrive/cloudstack.go
deleted file mode 100644
index 37996527..00000000
--- a/internal/providers/cloudStackConfigDrive/cloudstack.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2017 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cloudStackConfigDrive
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"errors"
-	"github.com/coreos/coreos-metadata/internal/providers"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"syscall"
-)
-
-const (
-	diskByLabelPath               = "/dev/disk/by-label/"
-	configDriveMetadataPath       = "/cloudstack/metadata/"
-	configDriveMetadataMountPoint = "/media/ConfigDrive/cloudstack/metadata/"
-)
-
-func FetchMetadata() (providers.Metadata, error) {
-	m := providers.Metadata{}
-	m.Attributes = make(map[string]string)
-	mnt := ""
-
-	if !fileExists(configDriveMetadataMountPoint) {
-		err := error(nil)
-		mnt, err = mountConfigDrive("config-2")
-		if err != nil {
-			if mnt, err = mountConfigDrive("CONFIG-2"); err != nil {
-				return m, err
-			}
-		}
-		defer unmountConfigDrive(mnt)
-	} else {
-		mnt = configDriveMetadataMountPoint
-	}
-
-	if err := fetchAndSet("availability_zone.txt", mnt, "CLOUDSTACK_AVAILABILITY_ZONE", m.Attributes); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	if err := fetchAndSet("instance_id.txt", mnt, "CLOUDSTACK_INSTANCE_ID", m.Attributes); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	if err := fetchAndSet("service_offering.txt", mnt, "CLOUDSTACK_SERVICE_OFFERING", m.Attributes); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	if err := fetchAndSet("cloud_identifier.txt", mnt, "CLOUDSTACK_CLOUD_IDENTIFIER", m.Attributes); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	if err := fetchAndSet("local_hostname.txt", mnt, "CLOUDSTACK_LOCAL_HOSTNAME", m.Attributes); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	if err := fetchAndSet("vm_id.txt", mnt, "CLOUDSTACK_VM_ID", m.Attributes); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	keys, err := fetchKeys(mnt)
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-	m.SshKeys = keys
-	return m, nil
-}
-
-func fileExists(path string) bool {
-	_, err := os.Stat(path)
-	return (err == nil)
-}
-
-func labelExists(label string) bool {
-	_, err := getPath(label)
-	return (err == nil)
-}
-
-func getPath(label string) (string, error) {
-	path := diskByLabelPath + label
-
-	if fileExists(path) {
-		return path, nil
-	}
-
-	return "", fmt.Errorf("label not found: %s", label)
-}
-
-func mountConfigDrive(label string) (string, error) {
-	if !labelExists(label) {
-		return "", errors.New("Not able to find config drive.")
-	}
-	path, err := getPath(label)
-
-	mnt, err := ioutil.TempDir("", "coreos-metadata")
-	if err != nil {
-		return "", fmt.Errorf("failed to create temp directory: %v", err)
-	}
-
-	cmd := exec.Command("/bin/mount", "-o", "ro", "-t", "auto", path, mnt)
-	if err := cmd.Run(); err != nil {
-		return "", err
-	}
-
-	return mnt, nil
-}
-
-func readFromConfigDrive(mnt string, file string) (string, bool, error) {
-	configDrivePath := filepath.Join(mnt, configDriveMetadataPath, file)
-
-	if !fileExists(configDrivePath) {
-		return "", false, nil
-	}
-
-	output, err := ioutil.ReadFile(configDrivePath)
-
-	if err != nil {
-		return "", false, err
-	}
-
-	return string(output), true, nil
-}
-
-func unmountConfigDrive(mnt string) {
-	defer os.Remove(mnt)
-	defer syscall.Unmount(mnt, 0)
-}
-
-func fetchAndSet(key, mnt string, attrKey string, attributes map[string]string) error {
-	val, ok, err := readFromConfigDrive(mnt, key)
-	if err != nil {
-		return err
-	}
-	if !ok || val == "" {
-		return nil
-	}
-	attributes[attrKey] = val
-	return nil
-}
-
-func fetchKeys(mnt string) ([]string, error) {
-	keysListBlob, ok, err := readFromConfigDrive(mnt, "public_keys.txt")
-	if err != nil {
-		return nil, err
-	}
-	if !ok || keysListBlob == "" {
-		return nil, nil
-	}
-	keys := strings.Split(keysListBlob, "\n")
-
-	return keys, nil
-}
diff --git a/internal/providers/cloudStackMetadata/cloudstack.go b/internal/providers/cloudStackMetadata/cloudstack.go
deleted file mode 100644
index 03908c42..00000000
--- a/internal/providers/cloudStackMetadata/cloudstack.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package cloudStackMetadata
-
-import (
-	"bufio"
-	"fmt"
-	"net"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/coreos/coreos-metadata/internal/providers"
-	"github.com/coreos/coreos-metadata/internal/retry"
-)
-
-const (
-	LeaseRetryInterval = 500 * time.Millisecond
-)
-
-func FetchMetadata() (providers.Metadata, error) {
-	m := providers.Metadata{}
-	m.Attributes = make(map[string]string)
-
-	metadata := map[string]string{
-		"instance-id":       "CLOUDSTACK_INSTANCE_ID",
-		"local-hostname":    "CLOUDSTACK_LOCAL_HOSTNAME",
-		"public-hostname":   "CLOUDSTACK_PUBLIC_HOSTNAME",
-		"availability-zone": "CLOUDSTACK_AVAILABILITY_ZONE",
-		"public-ipv4":       "CLOUDSTACK_IPV4_PUBLIC",
-		"local-ipv4":        "CLOUDSTACK_IPV4_LOCAL",
-		"service-offering":  "CLOUDSTACK_SERVICE_OFFERING",
-		"cloud-identifier":  "CLOUDSTACK_CLOUD_IDENTIFIER",
-		"vm-id":             "CLOUDSTACK_VM_ID",
-	}
-
-	for key, value := range metadata {
-		if err := fetchAndSet(key, value, m.Attributes); err != nil {
-			return providers.Metadata{}, err
-		}
-	}
-
-	if err := fetchAndSet("local-hostname", "CLOUDSTACK_HOSTNAME", m.Attributes); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	keys, err := fetchKeys("public-keys")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-	m.SshKeys = keys
-
-	return m, nil
-}
-
-func fetchMetadata(key string) (string, bool, error) {
-	addr, err := getDHCPServerAddress()
-	if err != nil {
-		return "", false, err
-	}
-
-	url := "http://" + addr + "/latest/meta-data/"
-	body, err := retry.Client{
-		InitialBackoff: time.Second,
-		MaxBackoff:     time.Second * 5,
-		MaxAttempts:    10,
-	}.Get(url + key)
-	return string(body), (body != nil), err
-}
-
-func fetchAndSet(key, attrKey string, attributes map[string]string) error {
-	val, ok, err := fetchMetadata(key)
-	if err != nil {
-		return err
-	}
-	if !ok || val == "" {
-		return nil
-	}
-	attributes[attrKey] = val
-	return nil
-}
-
-func fetchKeys(key string) ([]string, error) {
-	keysListBlob, ok, err := fetchMetadata(key)
-	if err != nil {
-		return nil, err
-	}
-	if !ok || keysListBlob == "" {
-		return nil, nil
-	}
-	keys := strings.Split(keysListBlob, "\n")
-
-	return keys, nil
-}
-
-func findLease() (*os.File, error) {
-	ifaces, err := net.Interfaces()
-	if err != nil {
-		return nil, fmt.Errorf("could not list interfaces: %v", err)
-	}
-
-	for {
-		for _, iface := range ifaces {
-			lease, err := os.Open(fmt.Sprintf("/run/systemd/netif/leases/%d", iface.Index))
-			if os.IsNotExist(err) {
-				continue
-			} else if err != nil {
-				return nil, err
-			} else {
-				return lease, nil
-			}
-		}
-
-		fmt.Printf("No leases found. Waiting...")
-		time.Sleep(LeaseRetryInterval)
-	}
-}
-
-func getDHCPServerAddress() (string, error) {
-	lease, err := findLease()
-	if err != nil {
-		return "", err
-	}
-	defer lease.Close()
-
-	var address string
-	line := bufio.NewScanner(lease)
-	for line.Scan() {
-		parts := strings.Split(line.Text(), "=")
-		if parts[0] == "SERVER_ADDRESS" && len(parts) == 2 {
-			address = parts[1]
-			break
-		}
-	}
-
-	if len(address) == 0 {
-		return "", fmt.Errorf("dhcp server address not found in leases")
-	}
-
-	return address, nil
-}
diff --git a/internal/providers/digitalocean/digitalocean.go b/internal/providers/digitalocean/digitalocean.go
deleted file mode 100644
index 9cf29aae..00000000
--- a/internal/providers/digitalocean/digitalocean.go
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package digitalocean
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"time"
-
-	"github.com/coreos/coreos-metadata/internal/providers"
-	"github.com/coreos/coreos-metadata/internal/retry"
-)
-
-type Address struct {
-	IPAddress string `json:"ip_address"`
-	Netmask   string `json:"netmask"`
-	Cidr      int    `json:"cidr"`
-	Gateway   string `json:"gateway"`
-}
-
-type Interface struct {
-	IPv4       *Address `json:"ipv4"`
-	IPv6       *Address `json:"ipv6"`
-	AnchorIPv4 *Address `json:"anchor_ipv4"`
-	MAC        string   `json:"mac"`
-	Type       string   `json:"type"`
-}
-
-type Interfaces struct {
-	Public  []Interface `json:"public"`
-	Private []Interface `json:"private"`
-}
-
-type DNS struct {
-	Nameservers []string `json:"nameservers"`
-}
-
-type Metadata struct {
-	Hostname   string     `json:"hostname"`
-	Interfaces Interfaces `json:"interfaces"`
-	PublicKeys []string   `json:"public_keys"`
-	Region     string     `json:"region"`
-	DNS        DNS        `json:"dns"`
-}
-
-func FetchMetadata() (providers.Metadata, error) {
-	body, err := retry.Client{
-		InitialBackoff: time.Second,
-		MaxBackoff:     time.Second * 5,
-		MaxAttempts:    10,
-	}.Get("http://169.254.169.254/metadata/v1.json")
-
-	if err != nil {
-		return providers.Metadata{}, fmt.Errorf("failed to fetch metadata: %v", err)
-	}
-
-	var m Metadata
-	if err = json.Unmarshal(body, &m); err != nil {
-		return providers.Metadata{}, fmt.Errorf("failed to unmarshal metadata: %v", err)
-	}
-
-	network, err := parseNetwork(m)
-	if err != nil {
-		return providers.Metadata{}, fmt.Errorf("failed to parse network config from metadata: %v", err)
-	}
-
-	return providers.Metadata{
-		Attributes: parseAttributes(m),
-		Hostname:   m.Hostname,
-		Network:    network,
-		SshKeys:    m.PublicKeys,
-	}, nil
-}
-
-func parseAttributes(metadata Metadata) map[string]string {
-	attrs := map[string]string{
-		"DIGITALOCEAN_HOSTNAME": metadata.Hostname,
-		"DIGITALOCEAN_REGION":   metadata.Region,
-	}
-
-	for i, iface := range metadata.Interfaces.Public {
-		if iface.IPv4 != nil {
-			attrs[fmt.Sprintf("DIGITALOCEAN_IPV4_PUBLIC_%d", i)] =
-				providers.String(net.ParseIP(iface.IPv4.IPAddress))
-		}
-		if iface.IPv6 != nil {
-			attrs[fmt.Sprintf("DIGITALOCEAN_IPV6_PUBLIC_%d", i)] =
-				providers.String(net.ParseIP(iface.IPv6.IPAddress))
-		}
-		if iface.AnchorIPv4 != nil {
-			attrs[fmt.Sprintf("DIGITALOCEAN_IPV4_ANCHOR_%d", i)] =
-				providers.String(net.ParseIP(iface.AnchorIPv4.IPAddress))
-		}
-	}
-
-	for i, iface := range metadata.Interfaces.Private {
-		if iface.IPv4 != nil {
-			attrs[fmt.Sprintf("DIGITALOCEAN_IPV4_PRIVATE_%d", i)] =
-				providers.String(net.ParseIP(iface.IPv4.IPAddress))
-		}
-		if iface.IPv6 != nil {
-			attrs[fmt.Sprintf("DIGITALOCEAN_IPV6_PRIVATE_%d", i)] =
-				providers.String(net.ParseIP(iface.IPv6.IPAddress))
-		}
-	}
-
-	return attrs
-}
-
-func parseNetwork(metadata Metadata) ([]providers.NetworkInterface, error) {
-	servers, err := parseNameservers(metadata.DNS.Nameservers)
-	if err != nil {
-		return nil, err
-	}
-
-	ifaceConfigs := map[string]providers.NetworkInterface{}
-	for _, iface := range append(metadata.Interfaces.Private, metadata.Interfaces.Public...) {
-		mac, err := net.ParseMAC(iface.MAC)
-		if err != nil {
-			return nil, fmt.Errorf("could not parse %q as MAC address", iface.MAC)
-		}
-		addrs, routes, err := parseInterface(iface, iface.Type == "public")
-		if err != nil {
-			return nil, err
-		}
-
-		ifaceConfigs[iface.MAC] = providers.NetworkInterface{
-			HardwareAddress: mac,
-			Nameservers:     servers,
-			IPAddresses:     append(ifaceConfigs[iface.MAC].IPAddresses, addrs...),
-			Routes:          append(ifaceConfigs[iface.MAC].Routes, routes...),
-		}
-	}
-
-	var ifaces []providers.NetworkInterface
-	for _, iface := range ifaceConfigs {
-		ifaces = append(ifaces, iface)
-	}
-	return ifaces, nil
-}
-
-func parseInterface(iface Interface, public bool) ([]net.IPNet, []providers.NetworkRoute, error) {
-	var addrs []net.IPNet
-	var routes []providers.NetworkRoute
-
-	if iface.IPv4 != nil {
-		addr, err := parseIPv4Address(*iface.IPv4)
-		if err != nil {
-			return nil, nil, err
-		}
-		addrs = append(addrs, addr)
-
-		route, err := parseRoute(iface.IPv4.Gateway, addr)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		routes = append(routes, route)
-
-		if public {
-			routes = append(routes, providers.NetworkRoute{
-				Destination: net.IPNet{
-					IP:   net.IPv4zero,
-					Mask: net.IPMask(net.IPv4zero),
-				},
-				Gateway: route.Gateway,
-			})
-		}
-	}
-	if iface.IPv6 != nil {
-		addr, err := parseIPv6Address(*iface.IPv6)
-		if err != nil {
-			return nil, nil, err
-		}
-		addrs = append(addrs, addr)
-
-		route, err := parseRoute(iface.IPv6.Gateway, addr)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		routes = append(routes, route)
-		if public {
-			routes = append(routes, providers.NetworkRoute{
-				Destination: net.IPNet{
-					IP:   net.IPv6zero,
-					Mask: net.IPMask(net.IPv6zero),
-				},
-				Gateway: route.Gateway,
-			})
-		}
-	}
-	if iface.AnchorIPv4 != nil {
-		addr, err := parseIPv4Address(*iface.AnchorIPv4)
-		if err != nil {
-			return nil, nil, err
-		}
-		addrs = append(addrs, addr)
-
-		route, err := parseRoute(iface.AnchorIPv4.Gateway, addr)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		routes = append(routes, route)
-	}
-
-	return addrs, routes, nil
-}
-
-func parseIPv4Address(address Address) (net.IPNet, error) {
-	ip := net.ParseIP(address.IPAddress)
-	if ip == nil {
-		return net.IPNet{}, fmt.Errorf("could not parse %q as IPv4 address", address.IPAddress)
-	}
-
-	mask := net.ParseIP(address.Netmask)
-	if mask == nil {
-		return net.IPNet{}, fmt.Errorf("could not parse %q as IPv4 mask", address.Netmask)
-	}
-
-	return net.IPNet{
-		IP:   ip,
-		Mask: net.IPMask(mask.To4()),
-	}, nil
-}
-
-func parseIPv6Address(address Address) (net.IPNet, error) {
-	ip := net.ParseIP(address.IPAddress)
-	if ip == nil {
-		return net.IPNet{}, fmt.Errorf("could not parse %q as IPv6 address", address.IPAddress)
-	}
-
-	return net.IPNet{
-		IP:   ip,
-		Mask: net.CIDRMask(address.Cidr, net.IPv6len*8),
-	}, nil
-}
-
-func parseRoute(gateway string, destination net.IPNet) (providers.NetworkRoute, error) {
-	addr := net.ParseIP(gateway)
-	if addr == nil {
-		return providers.NetworkRoute{}, fmt.Errorf("could not parse %q as gateway address", gateway)
-	}
-
-	return providers.NetworkRoute{
-		Destination: destination,
-		Gateway:     addr,
-	}, nil
-}
-
-func parseNameservers(servers []string) ([]net.IP, error) {
-	var addrs []net.IP
-	for _, server := range servers {
-		addr := net.ParseIP(server)
-		if addr == nil {
-			return nil, fmt.Errorf("could not parse %q as IP address", server)
-		}
-
-		addrs = append(addrs, addr)
-	}
-	return addrs, nil
-}
diff --git a/internal/providers/ec2/ec2.go b/internal/providers/ec2/ec2.go
deleted file mode 100644
index 1d165752..00000000
--- a/internal/providers/ec2/ec2.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ec2
-
-import (
-	"bufio"
-	"encoding/json"
-	"fmt"
-	"net"
-	"strings"
-	"time"
-
-	"github.com/coreos/coreos-metadata/internal/providers"
-	"github.com/coreos/coreos-metadata/internal/retry"
-)
-
-type instanceIdDoc struct {
-	PrivateIp          string `json:"privateIp"`
-	DevpayProductCodes string `json:"devpayProductCodes"`
-	AvailabilityZone   string `json:"availabilityZone"`
-	Version            string `json:"version"`
-	Region             string `json:"region"`
-	PendingTime        string `json:"pendingTime"`
-	InstanceId         string `json:"instanceId"`
-	BillingProducts    string `json:"billingProducts"`
-	InstanceType       string `json:"instanceType"`
-	AccountId          string `json:"accountId"`
-	Architecture       string `json:"architecture"`
-	KernelId           string `json:"kernelId"`
-	RamdiskId          string `json:"ramdiskId"`
-	ImageId            string `json:"imageId"`
-}
-
-func FetchMetadata() (providers.Metadata, error) {
-	instanceId, _, err := fetchString("meta-data/instance-id")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-
-	public, err := fetchIP("meta-data/public-ipv4")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-	local, err := fetchIP("meta-data/local-ipv4")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-	hostname, _, err := fetchString("meta-data/hostname")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-	availabilityZone, _, err := fetchString("meta-data/placement/availability-zone")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-
-	instanceIdDocBlob, _, err := fetchString("dynamic/instance-identity/document")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-	var instanceIdDoc instanceIdDoc
-	err = json.Unmarshal([]byte(instanceIdDocBlob), &instanceIdDoc)
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-
-	sshKeys, err := fetchSshKeys()
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-
-	return providers.Metadata{
-		Attributes: map[string]string{
-			"EC2_INSTANCE_ID":       instanceId,
-			"EC2_IPV4_LOCAL":        providers.String(local),
-			"EC2_IPV4_PUBLIC":       providers.String(public),
-			"EC2_HOSTNAME":          hostname,
-			"EC2_AVAILABILITY_ZONE": availabilityZone,
-			"EC2_REGION":            instanceIdDoc.Region,
-		},
-		Hostname: hostname,
-		SshKeys:  sshKeys,
-	}, nil
-}
-
-func fetchString(key string) (string, bool, error) {
-	body, err := retry.Client{
-		InitialBackoff: time.Second,
-		MaxBackoff:     time.Second * 5,
-		MaxAttempts:    10,
-	}.Get("http://169.254.169.254/2009-04-04/" + key)
-	return string(body), (body != nil), err
-}
-
-func fetchIP(key string) (net.IP, error) {
-	str, present, err := fetchString(key)
-	if err != nil {
-		return nil, err
-	}
-
-	if !present {
-		return nil, nil
-	}
-
-	if ip := net.ParseIP(str); ip != nil {
-		return ip, nil
-	} else {
-		return nil, fmt.Errorf("couldn't parse %q as IP address", str)
-	}
-}
-
-func fetchSshKeys() ([]string, error) {
-	keydata, present, err := fetchString("meta-data/public-keys")
-	if err != nil {
-		return nil, fmt.Errorf("error reading keys: %v", err)
-	}
-
-	if !present {
-		return nil, nil
-	}
-
-	scanner := bufio.NewScanner(strings.NewReader(keydata))
-	keynames := []string{}
-	for scanner.Scan() {
-		keynames = append(keynames, scanner.Text())
-	}
-	if err := scanner.Err(); err != nil {
-		return nil, fmt.Errorf("error parsing keys: %v", err)
-	}
-
-	keyIDs := make(map[string]string)
-	for _, keyname := range keynames {
-		tokens := strings.SplitN(keyname, "=", 2)
-		if len(tokens) != 2 {
-			return nil, fmt.Errorf("malformed public key: %q", keyname)
-		}
-		keyIDs[tokens[1]] = tokens[0]
-	}
-
-	keys := []string{}
-	for _, id := range keyIDs {
-		sshkey, _, err := fetchString(fmt.Sprintf("meta-data/public-keys/%s/openssh-key", id))
-		if err != nil {
-			return nil, err
-		}
-		keys = append(keys, sshkey)
-	}
-
-	return keys, nil
-}
diff --git a/internal/providers/gce/gce.go b/internal/providers/gce/gce.go
deleted file mode 100644
index b15d5da8..00000000
--- a/internal/providers/gce/gce.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package gce
-
-import (
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/coreos/coreos-metadata/internal/providers"
-	"github.com/coreos/coreos-metadata/internal/retry"
-)
-
-func FetchMetadata() (providers.Metadata, error) {
-	public, err := fetchIP("instance/network-interfaces/0/access-configs/0/external-ip")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-	local, err := fetchIP("instance/network-interfaces/0/ip")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-	hostname, _, err := fetchString("instance/hostname")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-	sshKeys, err := fetchAllSshKeys()
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-
-	return providers.Metadata{
-		Attributes: map[string]string{
-			"GCE_IP_LOCAL_0":    providers.String(local),
-			"GCE_IP_EXTERNAL_0": providers.String(public),
-			"GCE_HOSTNAME":      hostname,
-		},
-		Hostname: hostname,
-		SshKeys:  sshKeys,
-	}, nil
-}
-
-func fetchAllSshKeys() ([]string, error) {
-	deprecatedInstanceSshKeys, err := fetchSshKeys("instance/attributes/sshKeys")
-	if err != nil {
-		return nil, err
-	}
-
-	if deprecatedInstanceSshKeys != nil {
-		return deprecatedInstanceSshKeys, nil
-	}
-
-	instanceSshKeys, err := fetchSshKeys("instance/attributes/ssh-keys")
-	if err != nil {
-		return nil, err
-	}
-
-	blockProjectKeys, _, err := fetchString("instance/attributes/block-project-ssh-keys")
-	if err != nil {
-		return nil, err
-	}
-
-	if block, err := strconv.ParseBool(blockProjectKeys); err == nil && block {
-		return instanceSshKeys, nil
-	}
-
-	projectSshKeys, err := fetchSshKeys("project/attributes/sshKeys")
-	if err != nil {
-		return nil, err
-	}
-
-	return append(instanceSshKeys, projectSshKeys...), nil
-}
-
-func fetchString(key string) (string, bool, error) {
-	body, err := retry.Client{
-		InitialBackoff: time.Second,
-		MaxBackoff:     time.Second * 5,
-		MaxAttempts:    10,
-		Header: map[string][]string{
-			"Metadata-Flavor": {"Google"},
-		},
-	}.Get("http://metadata.google.internal/computeMetadata/v1/" + key)
-
-	// Google's metadata service returns a 200 success even if there is no
-	// resource. Instead of checking to see if there is a body, check to see
-	// if the body is empty.
-	return string(body), len(body) > 0, err
-}
-
-func fetchIP(key string) (net.IP, error) {
-	str, present, err := fetchString(key)
-	if err != nil {
-		return nil, err
-	}
-
-	if !present {
-		return nil, nil
-	}
-
-	if ip := net.ParseIP(str); ip != nil {
-		return ip, nil
-	} else {
-		return nil, fmt.Errorf("couldn't parse %q as IP address", str)
-	}
-}
-
-func fetchSshKeys(prefix string) ([]string, error) {
-	keydata, present, err := fetchString(prefix)
-	if err != nil {
-		return nil, fmt.Errorf("error reading keys: %v", err)
-	}
-
-	if !present {
-		return nil, nil
-	}
-
-	keys := []string{}
-	for _, key := range strings.Split(keydata, "\n") {
-		if len(key) == 0 {
-			continue
-		}
-
-		tokens := strings.SplitN(key, ":", 2)
-		if len(tokens) != 2 {
-			return nil, fmt.Errorf("malformed public key '%s'", key)
-		}
-		keys = append(keys, tokens[1])
-	}
-
-	return keys, nil
-}
diff --git a/internal/providers/metadata.go b/internal/providers/metadata.go
deleted file mode 100644
index fc0e7ec6..00000000
--- a/internal/providers/metadata.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package providers
-
-import (
-	"fmt"
-	"net"
-	"reflect"
-)
-
-type Metadata struct {
-	Attributes map[string]string
-	Hostname   string
-	SshKeys    []string
-	Network    []NetworkInterface
-	NetDev     []NetworkDevice
-}
-
-type NetworkInterface struct {
-	Name            string
-	HardwareAddress net.HardwareAddr
-	Priority        int
-	Nameservers     []net.IP
-	IPAddresses     []net.IPNet
-	Routes          []NetworkRoute
-	Bond            string
-}
-
-type NetworkRoute struct {
-	Destination net.IPNet
-	Gateway     net.IP
-}
-
-type NetworkDevice struct {
-	Name            string
-	Kind            string
-	HardwareAddress net.HardwareAddr
-	Priority        int
-	Sections        []Section
-}
-
-type Section struct {
-	Name       string
-	Attributes [][2]string
-}
-
-func (i NetworkInterface) UnitName() string {
-	priority := i.Priority
-	if priority == 0 {
-		priority = 10
-	}
-	name := i.Name
-	if name == "" {
-		name = i.HardwareAddress.String()
-	}
-	return fmt.Sprintf("%02d-%s.network", priority, name)
-}
-
-func (i NetworkInterface) NetworkConfig() string {
-	config := "[Match]\n"
-	if i.Name != "" {
-		config += fmt.Sprintf("Name=%s\n", i.Name)
-	}
-	if i.HardwareAddress != nil {
-		config += fmt.Sprintf("MACAddress=%s\n", i.HardwareAddress)
-	}
-
-	config += "\n[Network]\n"
-	for _, nameserver := range i.Nameservers {
-		config += fmt.Sprintf("DNS=%s\n", nameserver)
-	}
-	if i.Bond != "" {
-		config += fmt.Sprintf("Bond=%s\n", i.Bond)
-	}
-
-	for _, addr := range i.IPAddresses {
-		config += fmt.Sprintf("\n[Address]\nAddress=%s\n", addr.String())
-	}
-	for _, route := range i.Routes {
-		config += fmt.Sprintf("\n[Route]\nDestination=%s\nGateway=%s\n", route.Destination.String(), route.Gateway)
-	}
-
-	return config
-}
-
-func (d NetworkDevice) UnitName() string {
-	priority := d.Priority
-	if priority == 0 {
-		priority = 10
-	}
-	return fmt.Sprintf("%02d-%s.netdev", priority, d.Name)
-}
-
-func (d NetworkDevice) NetdevConfig() string {
-	config := fmt.Sprintf("[NetDev]\nName=%s\nKind=%s\nMACAddress=%s\n", d.Name, d.Kind, d.HardwareAddress)
-
-	for _, section := range d.Sections {
-		config += fmt.Sprintf("\n[%s]\n", section.Name)
-		for _, attr := range section.Attributes {
-			config += fmt.Sprintf("%s=%s\n", attr[0], attr[1])
-		}
-	}
-
-	return config
-}
-
-func String(s fmt.Stringer) string {
-	if reflect.ValueOf(s).IsNil() {
-		return ""
-	}
-
-	return s.String()
-}
diff --git a/internal/providers/openstackMetadata/metadata.go b/internal/providers/openstackMetadata/metadata.go
deleted file mode 100644
index 684fe054..00000000
--- a/internal/providers/openstackMetadata/metadata.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2017 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package openstackMetadata
-
-import (
-	"fmt"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/coreos/coreos-metadata/internal/providers"
-	"github.com/coreos/coreos-metadata/internal/retry"
-)
-
-const (
-	metadataEndpoint = "http://169.254.169.254/latest/meta-data/"
-)
-
-func FetchMetadata() (providers.Metadata, error) {
-	m := providers.Metadata{}
-	m.Attributes = make(map[string]string)
-
-	if err := fetchAndSet("instance-id", "OPENSTACK_INSTANCE_ID", m.Attributes); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	if err := fetchAndSet("local-ipv4", "OPENSTACK_IPV4_LOCAL", m.Attributes); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	if err := fetchAndSet("public-ipv4", "OPENSTACK_IPV4_PUBLIC", m.Attributes); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	if err := fetchAndSet("hostname", "OPENSTACK_HOSTNAME", m.Attributes); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	keys, err := fetchKeys()
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-	m.SshKeys = keys
-
-	return m, nil
-}
-
-func fetchAndSet(key, attrKey string, attributes map[string]string) error {
-	val, ok, err := fetchMetadata(key)
-	if err != nil {
-		return err
-	}
-	if !ok || val == "" {
-		return nil
-	}
-	attributes[attrKey] = val
-	return nil
-}
-
-func fetchKeys() ([]string, error) {
-	keysListBlob, ok, err := fetchMetadata("public-keys")
-	if err != nil {
-		return nil, err
-	}
-	if !ok || keysListBlob == "" {
-		return nil, nil
-	}
-	keysList := strings.Split(keysListBlob, "\n")
-
-	var keys []string
-
-	if len(keysList) > 0 {
-		keyID := keysList[0]
-		keyTokens := strings.Split(keyID, "=")
-		if len(keyTokens) != 2 {
-			return nil, fmt.Errorf("error parsing keyID %s", keyID)
-		}
-		keyNum := keyTokens[0]
-		// keyTokens[1] is the name of the key, but is currently unused here
-		key, ok, err := fetchMetadata(path.Join("public-keys", keyNum, "openssh-key"))
-		if err != nil {
-			return nil, err
-		}
-		if !ok || key == "" {
-			return nil, fmt.Errorf("problem fetching key %s", keyID)
-		}
-		keys = append(keys, key)
-	}
-	return keys, nil
-}
-
-func fetchMetadata(key string) (string, bool, error) {
-	body, err := retry.Client{
-		InitialBackoff: time.Second,
-		MaxBackoff:     time.Second * 5,
-		MaxAttempts:    10,
-	}.Get(metadataEndpoint + key)
-	return string(body), (body != nil), err
-}
diff --git a/internal/providers/oracleoci/oracleoci.go b/internal/providers/oracleoci/oracleoci.go
deleted file mode 100644
index 9e116b8b..00000000
--- a/internal/providers/oracleoci/oracleoci.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2017 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oracleoci
-
-import (
-	"encoding/json"
-	"strings"
-	"time"
-
-	"github.com/coreos/coreos-metadata/internal/providers"
-	"github.com/coreos/coreos-metadata/internal/retry"
-)
-
-type instanceData struct {
-	AvailabilityDomain string   `json:"availabilityDomain"`
-	CompartmentId      string   `json:"compartmentId"`
-	DisplayName        string   `json:"displayName"`
-	Id                 string   `json:"id"`
-	Image              string   `json:"image"`
-	Region             string   `json:"region"`
-	Shape              string   `json:"shape"`
-	TimeCreated        uint64   `json:"timeCreated"`
-	Metadata           metadata `json:"metadata"`
-}
-
-type metadata struct {
-	SshAuthorizedKeys string `json:"ssh_authorized_keys"`
-}
-
-func FetchMetadata() (providers.Metadata, error) {
-	instanceDataBlob, err := retry.Client{
-		InitialBackoff: time.Second,
-		MaxBackoff:     time.Second * 5,
-		MaxAttempts:    10,
-	}.Get("http://169.254.169.254/opc/v1/instance/")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-
-	var data instanceData
-	err = json.Unmarshal(instanceDataBlob, &data)
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-	return providers.Metadata{
-		Attributes: map[string]string{
-			"ORACLE_OCI_DISPLAY_NAME": data.DisplayName,
-			"ORACLE_OCI_INSTANCE_ID":  data.Id,
-			"ORACLE_OCI_REGION":       data.Region,
-		},
-		SshKeys: strings.Split(data.Metadata.SshAuthorizedKeys, "\n"),
-	}, nil
-}
diff --git a/internal/providers/packet/packet.go b/internal/providers/packet/packet.go
deleted file mode 100644
index da7db958..00000000
--- a/internal/providers/packet/packet.go
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package packet
-
-import (
-	"bufio"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/coreos/coreos-metadata/internal/providers"
-	"github.com/coreos/coreos-metadata/internal/retry"
-	"github.com/packethost/packngo/metadata"
-)
-
-func FetchMetadata() (providers.Metadata, error) {
-	body, err := retry.Client{
-		InitialBackoff: time.Second,
-		MaxBackoff:     time.Second * 5,
-		MaxAttempts:    10,
-	}.Get(metadata.BaseURL + "/metadata")
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-
-	var data struct {
-		Error        string `json:"error"`
-		PhoneHomeURL string `json:"phone_home_url"`
-		*metadata.CurrentDevice
-	}
-
-	if err := json.Unmarshal(body, &data); err != nil {
-		return providers.Metadata{}, err
-	}
-
-	if data.Error != "" {
-		return providers.Metadata{}, errors.New(data.Error)
-	}
-
-	network, netdev, err := parseNetwork(data.Network)
-	if err != nil {
-		return providers.Metadata{}, fmt.Errorf("failed to parse network config from metadata: %v", err)
-	}
-
-	attrs := getNetworkAttrs(data.Network)
-	attrs["PACKET_HOSTNAME"] = data.Hostname
-	attrs["PACKET_PHONE_HOME_URL"] = data.PhoneHomeURL
-
-	return providers.Metadata{
-		Attributes: attrs,
-		Hostname:   data.Hostname,
-		SshKeys:    data.SSHKeys,
-		Network:    network,
-		NetDev:     netdev,
-	}, nil
-}
-
-func parseNetwork(network metadata.NetworkInfo) ([]providers.NetworkInterface, []providers.NetworkDevice, error) {
-	nameservers, err := getDNSServers()
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to obtain DNS servers: %v", err)
-	}
-
-	ifaces := []providers.NetworkInterface{}
-	bondDev := "bond0"
-
-	for _, iface := range network.Interfaces {
-		mac, err := net.ParseMAC(iface.MAC)
-		if err != nil {
-			return nil, nil, fmt.Errorf("parsing MAC address %q: %v", iface.MAC, err)
-		}
-
-		ifaces = append(ifaces, providers.NetworkInterface{
-			HardwareAddress: mac,
-			Bond:            bondDev,
-		})
-	}
-
-	iface := providers.NetworkInterface{
-		Name:        bondDev,
-		Priority:    5,
-		Nameservers: nameservers,
-	}
-	for _, addr := range network.Addresses {
-		addrlen := 16
-		if addr.Address.To4() != nil {
-			addrlen = 4
-		}
-		dest := net.IPNet{
-			IP:   make([]byte, addrlen),
-			Mask: make([]byte, addrlen),
-		}
-		if !addr.Public {
-			if addrlen == 16 {
-				// private IPv6 address??
-				continue
-			}
-			dest = net.IPNet{
-				IP:   net.IPv4(10, 0, 0, 0),
-				Mask: net.IPMask(net.IPv4(255, 0, 0, 0)),
-			}
-		}
-
-		iface.IPAddresses = append(iface.IPAddresses, net.IPNet{
-			IP:   addr.Address,
-			Mask: []byte(addr.NetworkMask),
-		})
-		iface.Routes = append(iface.Routes, providers.NetworkRoute{
-			Destination: dest,
-			Gateway:     addr.Gateway,
-		})
-	}
-	ifaces = append(ifaces, iface)
-
-	attrs := [][2]string{
-		// yay hardcoded stuff
-		{"TransmitHashPolicy", "layer3+4"},
-		{"MIIMonitorSec", ".1"},
-		{"UpDelaySec", ".2"},
-		{"DownDelaySec", ".2"},
-		{"Mode", network.BondingMode().String()},
-	}
-	if network.BondingMode() == metadata.BondingLACP {
-		attrs = append(attrs, [2]string{"LACPTransmitRate", "fast"})
-	}
-	netdevs := []providers.NetworkDevice{
-		{
-			Name:            bondDev,
-			Kind:            "bond",
-			HardwareAddress: ifaces[0].HardwareAddress,
-			Priority:        5,
-			Sections: []providers.Section{
-				{
-					Name:       "Bond",
-					Attributes: attrs,
-				},
-			},
-		},
-	}
-
-	return ifaces, netdevs, nil
-}
-
-func getDNSServers() ([]net.IP, error) {
-	state, err := os.Open("/run/systemd/netif/state")
-	if err != nil {
-		return nil, err
-	}
-	defer state.Close()
-
-	var addrs []net.IP
-	line := bufio.NewScanner(state)
-	for line.Scan() {
-		parts := strings.Split(line.Text(), "=")
-		if len(parts) == 2 && parts[0] == "DNS" {
-			for _, addr := range strings.Split(parts[1], " ") {
-				ip := net.ParseIP(addr)
-				if ip != nil {
-					addrs = append(addrs, ip)
-				}
-			}
-		}
-	}
-	if len(addrs) == 0 {
-		return nil, fmt.Errorf("no DNS servers in %v", state.Name())
-	}
-	return addrs, nil
-}
-
-func getNetworkAttrs(network metadata.NetworkInfo) map[string]string {
-	var publicIPv4, privateIPv4, publicIPv6, privateIPv6 []net.IP
-
-	for _, addr := range network.Addresses {
-		switch {
-		case addr.Family == 4 && addr.Public:
-			publicIPv4 = append(publicIPv4, addr.Address)
-
-		case addr.Family == 4 && !addr.Public:
-			privateIPv4 = append(privateIPv4, addr.Address)
-
-		case addr.Family == 6 && addr.Public:
-			publicIPv6 = append(publicIPv6, addr.Address)
-
-		case addr.Family == 6 && !addr.Public:
-			privateIPv6 = append(privateIPv6, addr.Address)
-		}
-	}
-
-	addresses := make(map[string]string)
-
-	for i, ip := range publicIPv4 {
-		addresses[fmt.Sprintf("PACKET_IPV4_PUBLIC_%d", i)] = providers.String(ip)
-	}
-
-	for i, ip := range privateIPv4 {
-		addresses[fmt.Sprintf("PACKET_IPV4_PRIVATE_%d", i)] = providers.String(ip)
-	}
-
-	for i, ip := range publicIPv6 {
-		addresses[fmt.Sprintf("PACKET_IPV6_PUBLIC_%d", i)] = providers.String(ip)
-	}
-
-	for i, ip := range privateIPv6 {
-		addresses[fmt.Sprintf("PACKET_IPV6_PRIVATE_%d", i)] = providers.String(ip)
-	}
-
-	return addresses
-}
diff --git a/internal/providers/vagrant_virtualbox/vagrant_virtualbox.go b/internal/providers/vagrant_virtualbox/vagrant_virtualbox.go
deleted file mode 100644
index 1bcf621b..00000000
--- a/internal/providers/vagrant_virtualbox/vagrant_virtualbox.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2017 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vagrant_virtualbox
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"os"
-	"time"
-
-	"github.com/coreos/coreos-metadata/internal/providers"
-)
-
-type metadata struct {
-	privateIPv4 net.IP
-	hostname    string
-}
-
-func FetchMetadata() (providers.Metadata, error) {
-	config, err := genConfig()
-	if err != nil {
-		return providers.Metadata{}, err
-	}
-
-	return providers.Metadata{
-		Attributes: map[string]string{
-			"VAGRANT_VIRTUALBOX_PRIVATE_IPV4": providers.String(config.privateIPv4),
-			"VAGRANT_VIRTUALBOX_HOSTNAME":     config.hostname,
-		},
-	}, nil
-}
-
-func genConfig() (metadata, error) {
-	config := metadata{}
-	var err error
-	config.privateIPv4, err = getIP()
-	if err != nil {
-		return metadata{}, err
-	}
-	config.hostname, err = os.Hostname()
-	if err != nil {
-		return metadata{}, err
-	}
-	return config, nil
-}
-
-func getIP() (net.IP, error) {
-	// eth1 may not yet be available or configured; wait
-	maxAttempts := 30
-	for attempt := 1; attempt <= maxAttempts; attempt++ {
-		interfaces, err := net.Interfaces()
-		if err != nil {
-			return nil, err
-		}
-		for _, iface := range interfaces {
-			if iface.Name == "eth1" {
-				addrs, err := iface.Addrs()
-				if err != nil {
-					return nil, err
-				}
-				for _, addr := range addrs {
-					ip, _, err := net.ParseCIDR(addr.String())
-					if err != nil {
-						return nil, err
-					}
-					if ip.To4() != nil {
-						return ip, nil
-					}
-				}
-			}
-		}
-		fmt.Println("eth1 not found; waiting 2 seconds")
-		time.Sleep(2 * time.Second)
-	}
-	return nil, errors.New("eth1 was not found!")
-}
diff --git a/internal/retry/client.go b/internal/retry/client.go
deleted file mode 100644
index 5dcfb2ce..00000000
--- a/internal/retry/client.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package retry
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"time"
-)
-
-type Client struct {
-	InitialBackoff time.Duration
-	MaxBackoff     time.Duration
-	MaxAttempts    int
-	Header         http.Header
-}
-
-func (c Client) Get(url string) ([]byte, error) {
-	delay := c.InitialBackoff
-	for attempt := 1; attempt <= c.MaxAttempts; attempt++ {
-		fmt.Printf("Fetching %q: Attempt #%d\n", url, attempt)
-
-		request, err := http.NewRequest("GET", url, nil)
-		if err != nil {
-			return nil, err
-		}
-
-		request.Header = c.Header
-
-		if response, err := (&http.Client{}).Do(request); err != nil {
-			fmt.Printf("Failed to fetch: %v\n", err)
-		} else if response.StatusCode == http.StatusNotFound {
-			return nil, nil
-		} else if response.StatusCode != http.StatusOK {
-			fmt.Printf("Failed to fetch: %s\n", http.StatusText(response.StatusCode))
-		} else {
-			defer response.Body.Close()
-			return ioutil.ReadAll(response.Body)
-		}
-
-		time.Sleep(delay)
-		delay *= 2
-		if delay > c.MaxBackoff {
-			delay = c.MaxBackoff
-		}
-	}
-
-	return nil, fmt.Errorf("timed out while fetching %q", url)
-}
-
-func (c Client) Getf(format string, a ...interface{}) ([]byte, error) {
-	return c.Get(fmt.Sprintf(format, a...))
-}
diff --git a/internal/vendor/github.com/coreos/update-ssh-keys/authorized_keys_d b/internal/vendor/github.com/coreos/update-ssh-keys/authorized_keys_d
deleted file mode 120000
index bf963fef..00000000
--- a/internal/vendor/github.com/coreos/update-ssh-keys/authorized_keys_d
+++ /dev/null
@@ -1 +0,0 @@
-src/authorized_keys_d
\ No newline at end of file
diff --git a/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.c b/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.c
deleted file mode 100644
index f84b4648..00000000
--- a/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.c
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#define _GNU_SOURCE
-#include <errno.h>
-#include <fcntl.h>
-#include <sched.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include "as_user.h"
-
-// By doing these operations in CGO, we prevent the Go scheduler from
-// potentially executing while our uid/gid/umask is changed.
-//
-// By doing them in a new !CLONE_FS thread we also localize the effects of the
-// umask() switching.
-//
-// The calling go code must supply the appropriate args struct.
-// We create a new thread passing the args down verbatim, it's all fairly
-// mechanical.  There's no need to restore umask/eids since we just exit the
-// created thread when done.
-//
-// The return value and errno is simply fed back to the caller from the thread
-// through some variables in ctxt.  Synchronization is achieved via waitpid().
-
-#define STACK_SIZE (64 * 1024)
-
-typedef struct au_thread_ctxt {
-	au_ids_t	*ids;
-
-	void		*stack;
-	int		(*fn)(void *);
-	void		*fn_args;
-
-	int		ret;
-	int		err;
-} au_thread_ctxt_t;
-
-/* set_eids() sets the effective gid and uid of the calling thread to ids */
-static int set_eids(au_ids_t *ids) {
-	uid_t	cu;
-	gid_t	cg;
-
-	umask(077);
-
-	cu = geteuid();
-	cg = getegid();
-
-	if(cg != ids->gid && setregid(-1, ids->gid) == -1)
-		return -1;
-
-	if(cu != ids->uid && setreuid(-1, ids->uid) == -1)
-		return -1;
-
-	return 0;
-}
-
-/* in_thread_fn() switches users and calls ctxt->fn */
-static int in_thread_fn(au_thread_ctxt_t *ctxt) {
-	if((ctxt->ret = set_eids(ctxt->ids)) == 0)
-		ctxt->ret = ctxt->fn(ctxt->fn_args);
-
-	ctxt->err = errno;
-
-	return 0;
-}
-
-/* in_thread() calls in_thread_fn() in a new thread passing fn and args along in
- * via an au_thread_ctxt_t.
- */
-static int in_thread(au_ids_t *ids, int (*fn)(void *), void *fn_args) {
-	int			pid, ret = 0;
-	au_thread_ctxt_t	ctxt = {
-					.ids = ids,
-					.fn = fn,
-					.fn_args = fn_args,
-					.err = 0,
-					.ret = -1,
-				};
-	sigset_t		allsigs, orig;
-
-	if(!(ctxt.stack = malloc(STACK_SIZE))) {
-		ret = -1;
-		goto out;
-	}
-
-	/* It's necessary to block all signals before cloning, so the child
-	 * doesn't run any of the Go runtime's signal handlers.
-	 */
-	if((ret = sigemptyset(&orig)) == -1 ||
-	   (ret = sigfillset(&allsigs)) == -1)
-		goto out_stack;
-
-	if((ret = sigprocmask(SIG_BLOCK, &allsigs, &orig)) == -1)
-		goto out_stack;
-
-	pid = clone((int(*)(void *))in_thread_fn, ctxt.stack + STACK_SIZE,
-		    CLONE_FILES|CLONE_VM, &ctxt);
-
-	ret = sigprocmask(SIG_SETMASK, &orig, NULL);
-
-	if(pid != -1) {
-		if(waitpid(pid, NULL, __WCLONE) == -1 && errno != ECHILD) {
-			ret = -1;
-			goto out_stack;
-		}
-	} else {
-		ret = -1;
-	}
-
-	if(ret != -1) {
-		errno = ctxt.err;
-		ret = ctxt.ret;
-	}
-
-out_stack:
-	free(ctxt.stack);
-
-out:
-	return ret;
-}
-
-/* au_open() */
-static int au_open_fn(au_open_args_t *args) {
-	return open(args->path, args->flags, args->mode);
-}
-
-int au_open(au_open_args_t *args) {
-	return in_thread(&args->ids, (int(*)(void *))au_open_fn, args);
-}
-
-/* au_mkdir_all() */
-static int au_mkdir_all_fn(au_mkdir_all_args_t *args) {
-	int	ret = 0;
-	char	*sep, *dup;
-
-	/* TODO(vc): rewrite this, it's difficult to follow and probably buggy */
-
-	if(!*(args->path))
-		goto out;
-
-	if(!(dup = strdup(args->path))) {
-		ret = -1;
-		goto out;
-	}
-
-	for(sep = dup + 1; sep;) {
-		/* find next slash or end of path */
-		while(*sep && (*sep) != '/') sep++;
-		if(*sep)
-			*sep = '\0';
-		else
-			sep = NULL;
-
-		if(((ret = mkdir(dup, args->mode)) == -1) && errno != EEXIST)
-			goto out_free;
-
-		if(sep) {
-			/* restore the '/' and skip '/'s */
-			*sep = '/';
-			while(*sep && *sep == '/') sep++;
-		}
-	}
-
-	if(ret == -1 && errno == EEXIST)
-		ret = 0;
-
-out_free:
-	free(dup);
-
-out:
-	return ret;
-}
-
-int au_mkdir_all(au_mkdir_all_args_t *args) {
-	return in_thread(&args->ids, (int(*)(void *))au_mkdir_all_fn, args);
-}
-
-/* au_rename() */
-static int au_rename_fn(au_rename_args_t *args) {
-	return rename(args->oldpath, args->newpath);
-}
-
-int au_rename(au_rename_args_t *args) {
-	return in_thread(&args->ids, (int(*)(void *))au_rename_fn, args);
-}
diff --git a/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.go b/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.go
deleted file mode 100644
index b3d27fdc..00000000
--- a/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux
-
-package as_user
-
-// #include "as_user.h"
-import "C"
-
-import (
-	"fmt"
-	"os"
-	"os/user"
-	"strconv"
-)
-
-// TODO(vc): do this at akd.Open() and make our own typed user struct.
-// getIds extracts the uid and guid as integers from a user.User.
-func getIds(u *user.User) (C.int, C.int, error) {
-	uid, err := strconv.Atoi(u.Uid)
-	if err != nil {
-		return -1, -1, fmt.Errorf("invalid uid: %v", err)
-	}
-
-	gid, err := strconv.Atoi(u.Gid)
-	if err != nil {
-		return -1, -1, fmt.Errorf("invalid gid: %v", err)
-	}
-	return C.int(uid), C.int(gid), nil
-}
-
-// OpenFile reimplements os.OpenFile but switching euid/egid first if necessary.
-func OpenFile(u *user.User, name string, flags int, perm uint32) (*os.File, error) {
-	uid, gid, err := getIds(u)
-	if err != nil {
-		return nil, err
-	}
-	args := C.au_open_args_t{
-		ids:   C.au_ids_t{uid: uid, gid: gid},
-		path:  C.CString(name),
-		flags: C.uint(flags),
-		mode:  C.uint(perm),
-	}
-
-	fd, err := C.au_open(&args)
-	if fd < 0 {
-		return nil, err
-	}
-	return os.NewFile(uintptr(fd), name), nil
-}
-
-// MkdirAll reimplements os.MkdirAll but switching euid/egid first if necessary.
-func MkdirAll(u *user.User, path string, perm uint32) error {
-	uid, gid, err := getIds(u)
-	if err != nil {
-		return err
-	}
-	args := C.au_mkdir_all_args_t{
-		ids:  C.au_ids_t{uid: uid, gid: gid},
-		path: C.CString(path),
-		mode: C.uint(perm),
-	}
-
-	if ret, err := C.au_mkdir_all(&args); ret < 0 {
-		return err
-	}
-	return nil
-}
-
-// Rename reimplements os.Rename but switching euid/egid first if necessary.
-func Rename(u *user.User, oldpath, newpath string) error {
-	uid, gid, err := getIds(u)
-	if err != nil {
-		return err
-	}
-	args := C.au_rename_args_t{
-		ids:     C.au_ids_t{uid: uid, gid: gid},
-		oldpath: C.CString(oldpath),
-		newpath: C.CString(newpath),
-	}
-
-	if ret, err := C.au_rename(&args); ret < 0 {
-		return err
-	}
-	return nil
-}
diff --git a/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.h b/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.h
deleted file mode 100644
index d94911ae..00000000
--- a/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/as_user/as_user.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-typedef struct au_ids {
-	int	uid;
-	int	gid;
-} au_ids_t;
-
-typedef struct au_open_args {
-	au_ids_t	ids;
-	const char	*path;
-	unsigned int	flags;
-	unsigned int	mode;
-} au_open_args_t;
-
-typedef struct au_mkdir_all_args {
-	au_ids_t	ids;
-	const char	*path;
-	unsigned int	mode;
-} au_mkdir_all_args_t;
-
-typedef struct au_rename_args {
-	au_ids_t	ids;
-	const char	*oldpath;
-	const char	*newpath;
-} au_rename_args_t;
-
-int au_open(au_open_args_t *);
-int au_mkdir_all(au_mkdir_all_args_t *);
-int au_rename(au_rename_args_t *);
diff --git a/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/authorized_keys_d.go b/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/authorized_keys_d.go
deleted file mode 100644
index 0c4bd785..00000000
--- a/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/authorized_keys_d.go
+++ /dev/null
@@ -1,369 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux
-
-// authorized_keys_d manages a user's ~/.ssh/authorized_keys.d and can produce
-// a ~/.ssh/authorized_keys file from the authorized_keys.d contents.
-package authorized_keys_d
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/user"
-	"path/filepath"
-	"sort"
-	"strings"
-	"syscall"
-
-	"github.com/coreos/update-ssh-keys/authorized_keys_d/as_user"
-)
-
-const (
-	AuthorizedKeysFile = "authorized_keys"
-	AuthorizedKeysDir  = "authorized_keys.d"
-	PreservedKeysName  = "orig_authorized_keys"
-	SSHDir             = ".ssh"
-
-	lockFile  = ".authorized_keys.d.lock"       // In "~/".
-	stageFile = ".authorized_keys.d.stage_file" // In "~/.ssh".
-	stageDir  = ".authorized_keys.d.stage_dir"  // In "~/.ssh".
-)
-
-// SSHAuthorizedKeysDir represents an opened user's authorized_keys.d.
-type SSHAuthorizedKeysDir struct {
-	path string     // Path to authorized_keys.d directory.
-	user *user.User // User of the directory.
-	lock *os.File   // Lock file for serializing Open()-Close().
-}
-
-// SSHAuthorizedKey represents an opened user's authorized_keys.d/<name> entry.
-type SSHAuthorizedKey struct {
-	Name     string                // Name given to the key.
-	Disabled bool                  // Disabled state of the key.
-	Path     string                // Path to the file backing the key.
-	origin   *SSHAuthorizedKeysDir // Originating dir for this key.
-}
-
-// sshDirPath returns the path to the .ssh dir for the user.
-func sshDirPath(u *user.User) string {
-	return filepath.Join(u.HomeDir, SSHDir)
-}
-
-// authKeysFilePath returns the path to the authorized_keys file for the user.
-func authKeysFilePath(u *user.User) string {
-	return filepath.Join(sshDirPath(u), AuthorizedKeysFile)
-}
-
-// authKeysDirPath returns the path to the authorized_keys.d for the user.
-func authKeysDirPath(u *user.User) string {
-	return filepath.Join(sshDirPath(u), AuthorizedKeysDir)
-}
-
-// lockFilePath returns the path to the lock file for the user.
-func lockFilePath(u *user.User) string {
-	return filepath.Join(u.HomeDir, lockFile)
-}
-
-// stageDirPath returns the path to the staging directory for the user.
-func stageDirPath(u *user.User) string {
-	return filepath.Join(sshDirPath(u), stageDir)
-}
-
-// stageFilePath returns the path to the staging file for the user.
-func stageFilePath(u *user.User) string {
-	return filepath.Join(sshDirPath(u), stageFile)
-}
-
-// opendir opens the authorized keys directory.
-func opendir(dir string) (*SSHAuthorizedKeysDir, error) {
-	fi, err := os.Stat(dir)
-	if err != nil {
-		return nil, err
-	}
-	if !fi.IsDir() {
-		return nil, fmt.Errorf("%q is not a directory", dir)
-	}
-	return &SSHAuthorizedKeysDir{path: dir}, nil
-}
-
-// acquireLock locks the lock file for the given user's authorized_keys.d.
-// A lock file is created if it doesn't already exist.
-// The locking is currently a simple coarse-grained mutex held for the
-// Open()-Close() duration, implemented using a lock file in the user's ~/.
-func acquireLock(u *user.User) (*os.File, error) {
-	f, err := as_user.OpenFile(u, lockFilePath(u),
-		syscall.O_CREAT|syscall.O_RDONLY, 0600)
-	if err != nil {
-		return nil, err
-	}
-	if err := syscall.Flock(int(f.Fd()), syscall.LOCK_EX); err != nil {
-		f.Close()
-		return nil, err
-	}
-	return f, nil
-}
-
-// createAuthorizedKeysDir creates an authorized keys directory for the user.
-// If the user has an authorized_keys file, it is migrated.
-func createAuthorizedKeysDir(u *user.User) (*SSHAuthorizedKeysDir, error) {
-	td := stageDirPath(u)
-	if err := as_user.MkdirAll(u, td, 0700); err != nil {
-		return nil, err
-	}
-	defer os.RemoveAll(td)
-
-	akd, err := opendir(td)
-	if err != nil {
-		return nil, err
-	}
-	akd.user = u
-
-	akfb, err := ioutil.ReadFile(authKeysFilePath(u))
-	if err != nil && !os.IsNotExist(err) {
-		return nil, err
-	} else if err == nil {
-		err = akd.Add(PreservedKeysName, akfb, false, false)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if err = akd.rename(authKeysDirPath(u)); err != nil {
-		return nil, err
-	}
-	return akd, err
-}
-
-// Open opens the authorized keys directory for the supplied user.
-// If create is false, Open will fail if no directory exists yet.
-// If create is true, Open will create the directory if it doesn't exist,
-// preserving the authorized_keys file in the process.
-// After a successful open, Close should be called when finished to unlock
-// the directory.
-func Open(usr *user.User, create bool) (*SSHAuthorizedKeysDir, error) {
-	l, err := acquireLock(usr)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err != nil {
-			l.Close()
-		}
-	}()
-
-	akd, err := opendir(authKeysDirPath(usr))
-	if err != nil && (!create || !os.IsNotExist(err)) {
-		return nil, err
-	} else if os.IsNotExist(err) {
-		akd, err = createAuthorizedKeysDir(usr)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	akd.lock = l
-	akd.user = usr
-	return akd, nil
-}
-
-// Close closes the authorized keys directory.
-func (akd *SSHAuthorizedKeysDir) Close() error {
-	return akd.lock.Close()
-}
-
-// rename renames the authorized_keys dir to the supplied path.
-func (akd *SSHAuthorizedKeysDir) rename(to string) error {
-	err := as_user.Rename(akd.user, akd.path, to)
-	if err != nil {
-		return err
-	}
-	akd.path = to
-	return nil
-}
-
-// keyPath returns the path to the named key.
-func (akd *SSHAuthorizedKeysDir) keyPath(n string) string {
-	return filepath.Join(akd.path, n)
-}
-
-// WalkKeys iterates across all keys in akd, calling f for each key.
-// Iterating stops on error, and the error is propagated out.
-func (akd *SSHAuthorizedKeysDir) WalkKeys(f func(*SSHAuthorizedKey) error) error {
-	d, err := os.Open(akd.path)
-	if err != nil {
-		return err
-	}
-
-	names, err := d.Readdirnames(0)
-	if err != nil {
-		return err
-	}
-
-	sort.Strings(names)
-	for _, n := range names {
-		ak, err := akd.Open(n)
-		if err != nil {
-			return err
-		}
-		if err := f(ak); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Open opens the key at name.
-func (akd *SSHAuthorizedKeysDir) Open(name string) (*SSHAuthorizedKey, error) {
-	p := akd.keyPath(name)
-	fi, err := os.Stat(p)
-	if err != nil {
-		return nil, err
-	}
-	ak := &SSHAuthorizedKey{
-		Name:     name,
-		Disabled: (fi.Size() == 0),
-		Path:     p,
-		origin:   akd,
-	}
-	return ak, nil
-}
-
-// Remove removes the key at name.
-func (akd *SSHAuthorizedKeysDir) Remove(name string) error {
-	ak, err := akd.Open(name)
-	if err != nil {
-		return err
-	}
-	return ak.Remove()
-}
-
-// Disable disables the key at name.
-func (akd *SSHAuthorizedKeysDir) Disable(name string) error {
-	ak, err := akd.Open(name)
-	if err != nil {
-		return err
-	}
-	return ak.Disable()
-}
-
-// Add adds the supplied key at name.
-// replace enables replacing keys already existing at name.
-// force enables adding keys to a disabled name, enabling it in the process.
-// Names starting wtih ".", and anything containing "/" are disallowed.
-func (akd *SSHAuthorizedKeysDir) Add(name string, keys []byte, replace, force bool) error {
-	if strings.HasPrefix(name, ".") || strings.Contains(name, "/") {
-		return fmt.Errorf(`illegal name`)
-	}
-
-	p := akd.keyPath(name)
-	fi, err := os.Stat(p)
-	if err == nil {
-		if fi.Size() > 0 && !replace {
-			return fmt.Errorf("key %q already exists", name)
-		} else if fi.Size() == 0 && !force {
-			return fmt.Errorf("key %q disabled", name)
-		}
-	} else if !os.IsNotExist(err) {
-		return err
-	}
-	ak := &SSHAuthorizedKey{Path: p, origin: akd}
-	return ak.Replace(keys)
-}
-
-// KeysFilePath returns the backing authorized_keys file path for this
-// SSHAuthorizedKeysDir.  This is the file written to by Sync().
-func (akd *SSHAuthorizedKeysDir) KeysFilePath() string {
-	return authKeysFilePath(akd.user)
-}
-
-// KeysDirPath returns the authorized_keys.d directory path for this
-// SSHAuthorizedKeysDir.  This is the directory containing the discrete key
-// files.
-func (akd *SSHAuthorizedKeysDir) KeysDirPath() string {
-	return authKeysDirPath(akd.user)
-}
-
-// Sync synchronizes the user's ~/.ssh/authorized_keys file with the
-// current authorized_keys.d directory state.
-func (akd *SSHAuthorizedKeysDir) Sync() error {
-	sp := stageFilePath(akd.user)
-	sf, err := as_user.OpenFile(akd.user, sp,
-		syscall.O_CREAT|syscall.O_TRUNC|syscall.O_WRONLY, 0600)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err != nil {
-			sf.Close()
-			os.Remove(sp)
-		}
-	}()
-
-	if err := akd.WalkKeys(func(k *SSHAuthorizedKey) error {
-		if !k.Disabled {
-			kb, err := ioutil.ReadFile(k.Path)
-			if err != nil {
-				return err
-			}
-			kb = append(kb, '\n')
-			if _, err := sf.Write(kb); err != nil {
-				return err
-			}
-		}
-		return nil
-	}); err != nil {
-		return err
-	}
-
-	if err := sf.Close(); err != nil {
-		return err
-	}
-
-	err = as_user.Rename(akd.user, sp, authKeysFilePath(akd.user))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Remove removes the opened key.
-func (ak *SSHAuthorizedKey) Remove() error {
-	return os.Remove(ak.Path)
-}
-
-// Disable disables the opened key.
-func (ak *SSHAuthorizedKey) Disable() error {
-	return os.Truncate(ak.Path, 0)
-}
-
-// Replace replaces the opened key with the supplied data.
-func (ak *SSHAuthorizedKey) Replace(keys []byte) error {
-	sp := stageFilePath(ak.origin.user)
-	sf, err := as_user.OpenFile(ak.origin.user, sp,
-		syscall.O_WRONLY|syscall.O_CREAT|syscall.O_TRUNC, 0600)
-	if err != nil {
-		return err
-	}
-	defer os.Remove(sp)
-	if _, err = sf.Write(keys); err != nil {
-		return err
-	}
-	if err := sf.Close(); err != nil {
-		return err
-	}
-	return as_user.Rename(ak.origin.user, sp, ak.Path)
-}
diff --git a/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/authorized_keys_d_test.go b/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/authorized_keys_d_test.go
deleted file mode 100644
index dc37c3e4..00000000
--- a/internal/vendor/github.com/coreos/update-ssh-keys/src/authorized_keys_d/authorized_keys_d_test.go
+++ /dev/null
@@ -1,654 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package authorized_keys_d
-
-import (
-	"crypto/rand"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/user"
-	"path/filepath"
-	"reflect"
-	"strconv"
-	"testing"
-)
-
-const (
-	DirNode = iota
-	FileNode
-)
-
-type tree []node
-type node struct {
-	path  string
-	typ   int
-	mode  os.FileMode
-	bytes []byte
-}
-
-// create creates the tree rooted at the path where.
-// If tree is empty, where will not be created.
-func (t tree) create(where string) error {
-	if len(t) == 0 {
-		os.RemoveAll(where)
-		return nil
-	}
-
-	for i, n := range t {
-		p := filepath.Join(where, n.path)
-		switch n.typ {
-		case DirNode:
-			if err := os.MkdirAll(p, n.mode); err != nil {
-				return fmt.Errorf("%d: mkdir error: %v", i, err)
-			}
-			if err := os.Chmod(p, n.mode); err != nil {
-				return fmt.Errorf("%d: chown error: %v", i, err)
-			}
-		case FileNode:
-			err := ioutil.WriteFile(p, n.bytes, n.mode)
-			if err != nil {
-				return fmt.Errorf("%d: writefile error: %v", i, err)
-			}
-		default:
-			return fmt.Errorf("%d: unknown node type: %v", i, n.typ)
-		}
-	}
-
-	return nil
-}
-
-// testUser populates a user.User for testing.
-func testUser(home string) *user.User {
-	return &user.User{
-		Uid:      strconv.Itoa(os.Getuid()),
-		Gid:      strconv.Itoa(os.Getgid()),
-		Username: "test",
-		Name:     "test",
-		HomeDir:  home,
-	}
-}
-
-// testDir creates a temp directory for testing.
-func testDir(t *testing.T) string {
-	td, err := ioutil.TempDir("", "akd-test-")
-	if err != nil {
-		t.Fatalf("Failed to create temp dir: %v", err)
-	}
-	return td
-}
-
-func TestOpenClose(t *testing.T) {
-	tests := []struct {
-		create  bool
-		home    tree
-		success bool
-	}{
-		{ // 0: No home, no create, fail.
-		},
-		{ // 1: No home, yes create, fail.
-			create: true,
-		},
-		{ // 2: Empty home, no create, fail.
-			create:  false,
-			home:    tree{{path: ".", typ: DirNode, mode: 0700}},
-			success: false,
-		},
-		{ // 3: Empty home, yes create, success.
-			create:  true,
-			home:    tree{{path: ".", typ: DirNode, mode: 0700}},
-			success: true,
-		},
-		{ // 4: Empty home, no create, fail.
-			create:  false,
-			home:    tree{{path: ".", typ: DirNode, mode: 0700}},
-			success: false,
-		},
-		{ // 5: Intact home, no create, fail.
-			create: false,
-			home: tree{
-				{path: ".", typ: DirNode, mode: 0700},
-				{path: SSHDir, typ: DirNode, mode: 0700},
-				{
-					path: filepath.Join(SSHDir, AuthorizedKeysFile),
-					typ:  FileNode, mode: 0600,
-				},
-			},
-			success: false,
-		},
-		{ // 6: Intact home, yes create, succeed.
-			create: true,
-			home: tree{
-				{path: ".", typ: DirNode, mode: 0700},
-				{path: SSHDir, typ: DirNode, mode: 0700},
-				{
-					path: filepath.Join(SSHDir, AuthorizedKeysFile),
-					typ:  FileNode, mode: 0600,
-				},
-			},
-			success: true,
-		},
-		{ // 7: Managed home, no create, succeed.
-			create: false,
-			home: tree{
-				{path: ".", typ: DirNode, mode: 0700},
-				{path: SSHDir, typ: DirNode, mode: 0700},
-				{
-					path: filepath.Join(SSHDir, AuthorizedKeysFile),
-					typ:  FileNode, mode: 0600,
-				},
-				{
-					path: filepath.Join(SSHDir, AuthorizedKeysDir),
-					typ:  DirNode, mode: 0700,
-				},
-			},
-			success: true,
-		},
-		{ // 8: Managed home, yes create, succeed.
-			create: true,
-			home: tree{
-				{path: ".", typ: DirNode, mode: 0700},
-				{path: SSHDir, typ: DirNode, mode: 0700},
-				{
-					path: filepath.Join(SSHDir, AuthorizedKeysFile),
-					typ:  FileNode, mode: 0600,
-				},
-				{
-					path: filepath.Join(SSHDir, AuthorizedKeysDir),
-					typ:  DirNode, mode: 0700,
-				},
-			},
-			success: true,
-		},
-	}
-
-	for i, tt := range tests {
-		td := testDir(t)
-		if err := tt.home.create(td); err != nil {
-			t.Errorf("%d: failed to create home tree: %v", i, err)
-			continue
-		}
-
-		akd, err := Open(testUser(td), tt.create)
-		if (err == nil) != tt.success {
-			t.Errorf("%d: expected %v got %v", i, tt.success, bool(err == nil))
-			if err != nil {
-				t.Errorf("%d: unexpected error: %v", i, err)
-			}
-		}
-		if err == nil {
-			if err := akd.Close(); err != nil {
-				t.Errorf("%d: close failed: %v", i, err)
-			}
-		}
-		os.RemoveAll(td)
-	}
-}
-
-func TestAddKey(t *testing.T) {
-	tests := []struct {
-		name    string
-		disable bool
-		replace bool
-		force   bool
-		success bool
-	}{
-		{ // 0: Doesn't exist, no replace, success.
-			name:    "test",
-			success: true,
-		},
-		{ // 1: Exists, no replace, fail.
-			name: "test",
-		},
-		{ // 2: Exists, replace, succeed.
-			name:    "test",
-			replace: true,
-			success: true,
-		},
-		{ // 2: Exists (disabled), force, succeed.
-			name:    "test",
-			disable: true,
-			force:   true,
-			success: true,
-		},
-		{ // 2: Exists (disabled), !force, fail.
-			name:    "test",
-			disable: true,
-		},
-		{ // 3: Leading dot, fail.
-			name: ".hidden",
-		},
-		{ // 4: Leading dot, fail.
-			name: ".",
-		},
-		{ // 5: Leading dot, fail.
-			name: "..",
-		},
-		{ // 6: Contains slash, fail.
-			name: "no/slash",
-		},
-	}
-
-	td := testDir(t)
-	akd, err := Open(testUser(td), true)
-	if err != nil {
-		t.Fatalf("open error: %v", err)
-	}
-	defer func() {
-		akd.Close()
-		os.RemoveAll(td)
-	}()
-
-	for i, tt := range tests {
-		if tt.disable {
-			if err := akd.Disable(tt.name); err != nil {
-				t.Errorf("%d: disable failed: %v", i, err)
-			}
-		}
-		err := akd.Add(tt.name, []byte("test"), tt.replace, tt.force)
-		if (err == nil) != tt.success {
-			t.Errorf("%d: expected %v got %v", i, tt.success, bool(err == nil))
-		}
-	}
-}
-
-func TestWalkKeys(t *testing.T) {
-	tests := []struct {
-		names    []string
-		asWalked []string
-	}{
-		{ // 0: Empty, in-order.
-			names: []string{},
-		},
-		{ // 1: One, in-order.
-			names: []string{"0_one"},
-		},
-		{ // 2: Many, in-order.
-			names: []string{"0_one", "1_two", "2_three"},
-		},
-		{ // 3: Many, out-of-order.
-			// XXX: add order reflecting readdir order is fs-specific, harmless to try.
-			names:    []string{"0_one", "2_three", "1_two"},
-			asWalked: []string{"0_one", "1_two", "2_three"},
-		},
-	}
-
-	for i, tt := range tests {
-		td := testDir(t)
-		akd, err := Open(testUser(td), true)
-		if err != nil {
-			t.Errorf("%d: open error: %v", i, err)
-			os.RemoveAll(td)
-			continue
-		}
-
-		for _, n := range tt.names {
-			err := akd.Add(n, []byte("foobar"), false, false)
-			if err != nil {
-				t.Errorf("%d: add error: %v", i, err)
-			}
-		}
-
-		walked := []string{}
-		if err := akd.WalkKeys(func(k *SSHAuthorizedKey) error {
-			walked = append(walked, k.Name)
-			return nil
-		}); err != nil {
-			t.Errorf("%d: walk error: %v", i, err)
-		}
-
-		against := tt.names
-		if len(tt.asWalked) != 0 {
-			against = tt.asWalked
-		}
-
-		if !reflect.DeepEqual(walked, against) {
-			t.Errorf("%d: inconsistent result: %v vs. %v", i, walked, against)
-		}
-
-		akd.Close()
-		os.RemoveAll(td)
-	}
-}
-
-func TestOpenName(t *testing.T) {
-	tests := []struct {
-		names   []string
-		open    string
-		success bool
-	}{
-		{ // 0: Empty, absent, fail.
-			open:    "missing",
-			success: false,
-		},
-		{ // 1: Populated, absent, fail.
-			names:   []string{"a", "b", "c"},
-			open:    "missing",
-			success: false,
-		},
-		{ // 2: Populated, present, succeed.
-			names:   []string{"a", "b", "c"},
-			open:    "b",
-			success: true,
-		},
-	}
-
-	for i, tt := range tests {
-		td := testDir(t)
-		akd, err := Open(testUser(td), true)
-		if err != nil {
-			t.Errorf("%d: open error: %v", i, err)
-			os.RemoveAll(td)
-			continue
-		}
-
-		for _, n := range tt.names {
-			err := akd.Add(n, []byte("foobar"), false, false)
-			if err != nil {
-				t.Errorf("%d: add error: %v", i, err)
-			}
-		}
-
-		k, err := akd.Open(tt.open)
-		if (err == nil) != tt.success {
-			t.Errorf("%d: expected %v got %v", i, tt.success, bool(err == nil))
-		}
-		if err == nil && k.Name != tt.open {
-			t.Errorf("%d: expected %v got %v", i, tt.open, k.Name)
-		}
-
-		akd.Close()
-		os.RemoveAll(td)
-	}
-}
-
-func TestRemoveName(t *testing.T) {
-	tests := []struct {
-		names   []string
-		remove  string
-		success bool
-	}{
-		{ // 0: Empty, absent, fail.
-			remove:  "missing",
-			success: false,
-		},
-		{ // 1: Populated, absent, fail.
-			names:   []string{"a", "b", "c"},
-			remove:  "missing",
-			success: false,
-		},
-		{ // 2: Populated, present, succeed.
-			names:   []string{"a", "b", "c"},
-			remove:  "b",
-			success: true,
-		},
-	}
-
-	for i, tt := range tests {
-		td := testDir(t)
-		akd, err := Open(testUser(td), true)
-		if err != nil {
-			t.Errorf("%d: open error: %v", i, err)
-			os.RemoveAll(td)
-			continue
-		}
-
-		for _, n := range tt.names {
-			err := akd.Add(n, []byte("foobar"), false, false)
-			if err != nil {
-				t.Errorf("%d: add error: %v", i, err)
-			}
-		}
-
-		err = akd.Remove(tt.remove)
-		if (err == nil) != tt.success {
-			t.Errorf("%d: expected %v got %v", i, tt.success, bool(err == nil))
-		}
-
-		akd.Close()
-		os.RemoveAll(td)
-	}
-}
-
-func TestDisableName(t *testing.T) {
-	name := "test"
-	td := testDir(t)
-	defer os.RemoveAll(td)
-	akd, err := Open(testUser(td), true)
-	if err != nil {
-		t.Errorf("open error: %v", err)
-		return
-	}
-	defer akd.Close()
-
-	if err := akd.Add(name, []byte("foobar"), false, false); err != nil {
-		t.Errorf("add error: %v", err)
-		return
-	}
-
-	ak, err := akd.Open(name)
-	if err != nil {
-		t.Errorf("open name error: %v", err)
-		return
-	}
-
-	if ak.Disabled {
-		t.Errorf("unexpectedly disabled")
-		return
-	}
-
-	if err := akd.Disable(name); err != nil {
-		t.Errorf("disable failed: %v", err)
-		return
-	}
-
-	ak, err = akd.Open(name)
-	if err != nil {
-		t.Errorf("open name error: %v", err)
-		return
-	}
-
-	if !ak.Disabled {
-		t.Errorf("unexpected enabled")
-		return
-	}
-}
-
-func TestSync(t *testing.T) {
-	td := testDir(t)
-	defer os.RemoveAll(td)
-	akd, err := Open(testUser(td), true)
-	if err != nil {
-		t.Errorf("open error: %v", err)
-		return
-	}
-	defer akd.Close()
-
-	bytes := []byte{}
-	for i := 0; i < 10; i++ {
-		b := make([]byte, 512)
-		if _, err := rand.Read(b); err != nil {
-			t.Errorf("rand read err: %v", err)
-			return
-		}
-		if err := akd.Add(strconv.Itoa(i), b, false, false); err != nil {
-			t.Errorf("add error: %v", err)
-			return
-		}
-		bytes = append(bytes, b...)
-		bytes = append(bytes, '\n')
-	}
-
-	if err := akd.Sync(); err != nil {
-		t.Errorf("sync failed: %v", err)
-		return
-	}
-
-	rb, err := ioutil.ReadFile(akd.KeysFilePath())
-	if err != nil {
-		t.Errorf("read failed: %v", err)
-		return
-	}
-
-	if !reflect.DeepEqual(bytes, rb) {
-		t.Errorf("inconsistent output")
-	}
-}
-
-func TestRemove(t *testing.T) {
-	tests := []struct {
-		names   []string
-		remove  string
-		success bool
-	}{
-		{ // 0: Empty, absent, fail.
-			remove:  "missing",
-			success: false,
-		},
-		{ // 1: Populated, absent, fail.
-			names:   []string{"a", "b", "c"},
-			remove:  "missing",
-			success: false,
-		},
-		{ // 2: Populated, present, succeed.
-			names:   []string{"a", "b", "c"},
-			remove:  "b",
-			success: true,
-		},
-	}
-
-	for i, tt := range tests {
-		td := testDir(t)
-		akd, err := Open(testUser(td), true)
-		if err != nil {
-			t.Errorf("%d: open error: %v", i, err)
-			os.RemoveAll(td)
-			continue
-		}
-
-		for _, n := range tt.names {
-			err := akd.Add(n, []byte("foobar"), false, false)
-			if err != nil {
-				t.Errorf("%d: add error: %v", i, err)
-			}
-		}
-
-		ak, err := akd.Open(tt.remove)
-		if (err == nil) != tt.success {
-			t.Errorf("%d: expected %v got %v", i, tt.success, bool(err == nil))
-		}
-		if err != nil {
-			akd.Close()
-			os.RemoveAll(td)
-			continue
-		}
-
-		err = ak.Remove()
-		if (err == nil) != tt.success {
-			t.Errorf("%d: expected %v got %v", i, tt.success, bool(err == nil))
-		}
-
-		akd.Close()
-		os.RemoveAll(td)
-	}
-}
-
-func TestDisable(t *testing.T) {
-	name := "test"
-	td := testDir(t)
-	defer os.RemoveAll(td)
-	akd, err := Open(testUser(td), true)
-	if err != nil {
-		t.Errorf("open error: %v", err)
-		return
-	}
-	defer akd.Close()
-
-	if err := akd.Add(name, []byte("foobar"), false, false); err != nil {
-		t.Errorf("add error: %v", err)
-		return
-	}
-
-	ak, err := akd.Open(name)
-	if err != nil {
-		t.Errorf("open name error: %v", err)
-		return
-	}
-
-	if ak.Disabled {
-		t.Errorf("unexpectedly disabled")
-		return
-	}
-
-	if err := ak.Disable(); err != nil {
-		t.Errorf("disable failed: %v", err)
-		return
-	}
-
-	ak, err = akd.Open(name)
-	if err != nil {
-		t.Errorf("open name error: %v", err)
-		return
-	}
-
-	if !ak.Disabled {
-		t.Errorf("unexpected enabled")
-		return
-	}
-}
-
-func TestReplace(t *testing.T) {
-	name := "test"
-	td := testDir(t)
-	defer os.RemoveAll(td)
-	akd, err := Open(testUser(td), true)
-	if err != nil {
-		t.Errorf("open error: %v", err)
-		return
-	}
-	defer akd.Close()
-
-	if err := akd.Add(name, []byte("foobar"), false, false); err != nil {
-		t.Errorf("add error: %v", err)
-		return
-	}
-
-	ak, err := akd.Open(name)
-	if err != nil {
-		t.Errorf("open name error: %v", err)
-		return
-	}
-
-	if err := ak.Replace([]byte("moop")); err != nil {
-		t.Errorf("replace failed: %v", err)
-		return
-	}
-
-	ak, err = akd.Open(name)
-	if err != nil {
-		t.Errorf("open name error: %v", err)
-		return
-	}
-
-	b, err := ioutil.ReadFile(ak.Path)
-	if err != nil {
-		t.Errorf("readfile failed: %v", err)
-		return
-	}
-
-	if string(b) != "moop" {
-		t.Errorf("unexpected results: %q", string(b))
-	}
-}
diff --git a/internal/vendor/github.com/coreos/update-ssh-keys/src/main.go b/internal/vendor/github.com/coreos/update-ssh-keys/src/main.go
deleted file mode 100644
index d4382450..00000000
--- a/internal/vendor/github.com/coreos/update-ssh-keys/src/main.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"os/user"
-	"strings"
-
-	keys "github.com/coreos/update-ssh-keys/authorized_keys_d"
-)
-
-var (
-	flagUser     = flag.String("u", "core", "Update the given user's authorized_keys file.")
-	flagAdd      = flag.String("a", "", "Add the given keys, using the given name to identify them.")
-	flagAddForce = flag.String("A", "", "Add the given keys, even if it was disabled with '-D'.")
-	flagDelete   = flag.String("d", "", "Delete keys identified by the given name.")
-	flagDisable  = flag.String("D", "", "Disable the given set from being added with '-a'.")
-	flagList     = flag.Bool("l", false, "List the names and number of keys currently installed.")
-	flagReplace  = flag.Bool("n", true, "When adding, don't replace an existing key with the given name.")
-	flagHelp     = flag.Bool("h", false, "This ;-)")
-)
-
-func stderr(f string, a ...interface{}) {
-	out := fmt.Sprintf(f, a...)
-	fmt.Fprintln(os.Stderr, strings.TrimSuffix(out, "\n"))
-}
-
-func stdout(f string, a ...interface{}) {
-	out := fmt.Sprintf(f, a...)
-	fmt.Fprintln(os.Stdout, strings.TrimSuffix(out, "\n"))
-}
-
-func panicf(f string, a ...interface{}) {
-	panic(fmt.Sprintf(f, a...))
-}
-
-// printKeys prints all the keys currently managed.
-func printKeys(akd *keys.SSHAuthorizedKeysDir) error {
-	stdout("All keys for %s", *flagUser)
-	return akd.WalkKeys(func(k *keys.SSHAuthorizedKey) error {
-		if !k.Disabled {
-			cmd := exec.Command("ssh-keygen", "-l", "-f", k.Path)
-			out, err := cmd.CombinedOutput()
-			if err != nil {
-				return err
-			}
-			stdout("%s: %s", k.Name, string(out))
-		}
-		return nil
-	})
-}
-
-// addKeys adds keys to akd as name.
-func addKeys(akd *keys.SSHAuthorizedKeysDir, name string, force bool) error {
-	k := []byte{}
-	files := []*os.File{}
-
-	if flag.NArg() > 0 {
-		// read from files
-		for _, fp := range flag.Args() {
-			f, err := os.Open(fp)
-			if err != nil {
-				return err
-			}
-			defer f.Close()
-			files = append(files, f)
-		}
-	} else {
-		// read from stdin
-		files = append(files, os.Stdin)
-	}
-
-	for _, f := range files {
-		b, err := ioutil.ReadAll(f)
-		if err != nil {
-			return err
-		}
-		k = append(k, b...)
-	}
-
-	if !validKeys(k) {
-		return fmt.Errorf("key(s) invalid.")
-	}
-
-	return akd.Add(name, k, *flagReplace, force)
-}
-
-// validKeys validates a byte slice contains valid ssh keys.
-func validKeys(keys []byte) bool {
-	// we need to write out a temp file for ssh-keygen to consume.
-	tf, err := ioutil.TempFile("", "update-ssh-keys-")
-	if err != nil {
-		panicf("unable to create temporary file: %v", err)
-	}
-	defer func() {
-		os.Remove(tf.Name())
-		tf.Close()
-	}()
-
-	if _, err := tf.Write(keys); err != nil {
-		panicf("unable to write temporary file: %v", err)
-	}
-
-	cmd := exec.Command("ssh-keygen", "-l", "-f", tf.Name())
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return false
-	}
-	stdout("%s", out)
-
-	return true
-}
-
-func main() {
-	flag.Parse()
-
-	if *flagHelp {
-		flag.Usage()
-		os.Exit(1)
-	}
-
-	usr, err := user.Lookup(*flagUser)
-	if err != nil {
-		stderr("Failed to lookup user: %v", *flagUser)
-		os.Exit(2)
-	}
-
-	akd, err := keys.Open(usr, true)
-	if err != nil {
-		stderr("Failed to open: %v", err)
-		os.Exit(3)
-	}
-	defer akd.Close()
-
-	switch {
-	case *flagList:
-		if err := printKeys(akd); err != nil {
-			stderr("Failed to print keys: %v", err)
-			os.Exit(4)
-		}
-	case *flagAdd != "":
-		if err := addKeys(akd, *flagAdd, false); err != nil {
-			stderr("failed to add keys %q: %v", *flagAdd, err)
-			os.Exit(5)
-		}
-	case *flagAddForce != "":
-		if err := addKeys(akd, *flagAddForce, true); err != nil {
-			stderr("failed to add keys %q: %v", *flagAddForce, err)
-			os.Exit(6)
-		}
-	case *flagDelete != "":
-		if err := akd.Remove(*flagDelete); err != nil {
-			stderr("failed to delete key %q: %v", *flagDelete, err)
-			os.Exit(7)
-		}
-	case *flagDisable != "":
-		if err := akd.Disable(*flagDisable); err != nil {
-			stderr("failed to disable key %q: %v", *flagDisable, err)
-			os.Exit(8)
-		}
-	}
-
-	if err := akd.Sync(); err != nil {
-		stderr("Failed sync: %v", err)
-		os.Exit(9)
-	}
-	stdout("Updated %s", akd.KeysFilePath())
-
-	os.Exit(0)
-}
diff --git a/internal/vendor/github.com/coreos/update-ssh-keys/src/main_test.go b/internal/vendor/github.com/coreos/update-ssh-keys/src/main_test.go
deleted file mode 100644
index 572da155..00000000
--- a/internal/vendor/github.com/coreos/update-ssh-keys/src/main_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"testing"
-)
-
-func Test(t *testing.T) {
-	// TODO
-}
diff --git a/internal/vendor/github.com/packethost/packngo/LICENSE.txt b/internal/vendor/github.com/packethost/packngo/LICENSE.txt
deleted file mode 100644
index 57c50110..00000000
--- a/internal/vendor/github.com/packethost/packngo/LICENSE.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-Copyright (c) 2014 The packngo AUTHORS. All rights reserved.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-======================
-Portions of the client are based on code at:
-https://github.com/google/go-github/ and
-https://github.com/digitalocean/godo
-
-Copyright (c) 2013 The go-github AUTHORS. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/internal/vendor/github.com/packethost/packngo/metadata/metadata.go b/internal/vendor/github.com/packethost/packngo/metadata/metadata.go
deleted file mode 100644
index 1ac26968..00000000
--- a/internal/vendor/github.com/packethost/packngo/metadata/metadata.go
+++ /dev/null
@@ -1,153 +0,0 @@
-package metadata
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/http"
-)
-
-const BaseURL = "https://metadata.packet.net"
-
-func GetMetadata() (*CurrentDevice, error) {
-	res, err := http.Get(BaseURL + "/metadata")
-	if err != nil {
-		return nil, err
-	}
-
-	b, err := ioutil.ReadAll(res.Body)
-	res.Body.Close()
-	if err != nil {
-		return nil, err
-	}
-
-	var result struct {
-		Error string `json:"error"`
-		*CurrentDevice
-	}
-	if err := json.Unmarshal(b, &result); err != nil {
-		return nil, err
-	}
-	if result.Error != "" {
-		return nil, errors.New(result.Error)
-	}
-	return result.CurrentDevice, nil
-}
-
-func GetUserData() ([]byte, error) {
-	res, err := http.Get(BaseURL + "/userdata")
-	if err != nil {
-		return nil, err
-	}
-
-	b, err := ioutil.ReadAll(res.Body)
-	res.Body.Close()
-	return b, err
-}
-
-type AddressFamily int
-
-const (
-	IPv4 = AddressFamily(4)
-	IPv6 = AddressFamily(6)
-)
-
-type AddressInfo struct {
-	ID          string        `json:"id"`
-	Family      AddressFamily `json:"address_family"`
-	Public      bool          `json:"public"`
-	Management  bool          `json:"management"`
-	Address     net.IP        `json:"address"`
-	NetworkMask net.IP        `json:"netmask"`
-	Gateway     net.IP        `json:"gateway"`
-
-	// These are available, but not really needed:
-	//   Network     net.IP `json:"network"`
-	//   NetworkBits int    `json:"cidr"`
-}
-
-type BondingMode int
-
-const (
-	BondingBalanceRR    = BondingMode(0)
-	BondingActiveBackup = BondingMode(1)
-	BondingBalanceXOR   = BondingMode(2)
-	BondingBroadcast    = BondingMode(3)
-	BondingLACP         = BondingMode(4)
-	BondingBalanceTLB   = BondingMode(5)
-	BondingBalanceALB   = BondingMode(6)
-)
-
-var bondingModeStrings = map[BondingMode]string{
-	BondingBalanceRR:    "balance-rr",
-	BondingActiveBackup: "active-backup",
-	BondingBalanceXOR:   "balance-xor",
-	BondingBroadcast:    "broadcast",
-	BondingLACP:         "802.3ad",
-	BondingBalanceTLB:   "balance-tlb",
-	BondingBalanceALB:   "balance-alb",
-}
-
-func (m BondingMode) String() string {
-	if str, ok := bondingModeStrings[m]; ok {
-		return str
-	}
-	return fmt.Sprintf("%d", m)
-}
-
-type CurrentDevice struct {
-	ID       string          `json:"id"`
-	Hostname string          `json:"hostname"`
-	IQN      string          `json:"iqn"`
-	Plan     string          `json:"plan"`
-	Facility string          `json:"facility"`
-	Tags     []string        `json:"tags"`
-	SSHKeys  []string        `json:"ssh_keys"`
-	OS       OperatingSystem `json:"operating_system"`
-	Network  NetworkInfo     `json:"network"`
-	Volumes  []VolumeInfo    `json:"volume"`
-
-	// This is available, but is actually inaccurate, currently:
-	//   APIBaseURL string          `json:"api_url"`
-}
-
-type InterfaceInfo struct {
-	Name string `json:"name"`
-	MAC  string `json:"mac"`
-}
-
-func (i *InterfaceInfo) ParseMAC() (net.HardwareAddr, error) {
-	return net.ParseMAC(i.MAC)
-}
-
-type NetworkInfo struct {
-	Interfaces []InterfaceInfo `json:"interfaces"`
-	Addresses  []AddressInfo   `json:"addresses"`
-
-	Bonding struct {
-		Mode BondingMode `json:"mode"`
-	} `json:"bonding"`
-}
-
-func (n *NetworkInfo) BondingMode() BondingMode {
-	return n.Bonding.Mode
-}
-
-type OperatingSystem struct {
-	Slug    string `json:"slug"`
-	Distro  string `json:"distro"`
-	Version string `json:"version"`
-}
-
-type VolumeInfo struct {
-	Name string   `json:"name"`
-	IQN  string   `json:"iqn"`
-	IPs  []net.IP `json:"ips"`
-
-	Capacity struct {
-		Size int    `json:"size,string"`
-		Unit string `json:"unit"`
-	} `json:"capacity"`
-}
diff --git a/test b/test
deleted file mode 100755
index 324f6dfd..00000000
--- a/test
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-source ./build
-
-SRC=$(find . -name '*.go' \
-	-not -path "./internal/vendor/*")
-
-PKG=$(cd gopath/src/${REPO_PATH}; go list ./... | \
-	grep --invert-match vendor)
-
-echo "Checking gofix..."
-go tool fix -diff $SRC
-
-echo "Checking gofmt..."
-res=$(gofmt -d -e -s $SRC)
-echo "${res}"
-if [ -n "${res}" ]; then
-	exit 1
-fi
-
-echo "Checking govet..."
-go vet $PKG
-
-echo "Running tests..."
-go test -timeout 60s -cover $@ ${PKG} --race
-
-echo "Success"

From f5353d1c38486a55a0f4e60dd18a6835df8a4755 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 18 Jul 2017 14:02:56 -0700
Subject: [PATCH 02/71] *: add cargo project scaffolding

this adds the basic boilerplate for a rust/cargo project.
---
 .gitignore         |   2 +
 CONTRIBUTING.md    |  84 +++++++++++++++++++
 Cargo.lock         |   4 +
 Cargo.toml         |   6 ++
 DCO                |  36 ++++++++
 LICENSE            | 202 +++++++++++++++++++++++++++++++++++++++++++++
 NOTICE             |   5 ++
 code-of-conduct.md |  63 ++++++++++++++
 src/main.rs        |  17 ++++
 9 files changed, 419 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 CONTRIBUTING.md
 create mode 100644 Cargo.lock
 create mode 100644 Cargo.toml
 create mode 100644 DCO
 create mode 100644 LICENSE
 create mode 100644 NOTICE
 create mode 100644 code-of-conduct.md
 create mode 100644 src/main.rs

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..324c57f7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+target/
+**/*.rs.bk
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..70d08e8d
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,84 @@
+# How to Contribute
+
+CoreOS projects are [Apache 2.0 licensed](LICENSE) and accept contributions via
+GitHub pull requests.  This document outlines some of the conventions on
+development workflow, commit message formatting, contact points and other
+resources to make it easier to get your contribution accepted.
+
+## Certificate of Origin
+
+By contributing to this project you agree to the Developer Certificate of
+Origin (DCO). This document was created by the Linux Kernel community and is a
+simple statement that you, as a contributor, have the legal right to make the
+contribution. See the [DCO](DCO) file for details.
+
+## Email and Chat
+
+The project currently uses the general CoreOS email list and IRC channel:
+- Email: [coreos-dev](https://groups.google.com/forum/#!forum/coreos-dev)
+- IRC: #[coreos](irc://irc.freenode.org:6667/#coreos) IRC channel on freenode.org
+
+Please avoid emailing maintainers found in the MAINTAINERS file directly. They
+are very busy and read the mailing lists.
+
+##  Reporting a security vulnerability
+
+Due to their public nature, GitHub and mailing lists are not appropriate places for reporting vulnerabilities. Please refer to CoreOS's [security disclosure][disclosure] process when reporting issues that may be security related.
+
+## Getting Started
+
+- Fork the repository on GitHub
+- Read the [README](README.md) for build and test instructions
+- Play with the project, submit bugs, submit patches!
+
+### Contribution Flow
+
+This is a rough outline of what a contributor's workflow looks like:
+
+- Create a topic branch from where you want to base your work (usually master).
+- Make commits of logical units.
+- Make sure your commit messages are in the proper format (see below).
+- Push your changes to a topic branch in your fork of the repository.
+- Make sure the tests pass, and add any new tests as appropriate.
+- Submit a pull request to the original repository.
+
+Thanks for your contributions!
+
+### Coding Style
+
+CoreOS projects written in Go follow a set of style guidelines that we've documented
+[here](https://github.com/coreos/docs/tree/master/golang). Please follow them when
+working on your contributions.
+
+### Format of the Commit Message
+
+We follow a rough convention for commit messages that is designed to answer two
+questions: what changed and why. The subject line should feature the what and
+the body of the commit should describe the why.
+
+```
+scripts: add the test-cluster command
+
+this uses tmux to setup a test cluster that you can easily kill and
+start for debugging.
+
+Fixes #38
+```
+
+The format can be described more formally as follows:
+
+```
+<subsystem>: <what changed>
+<BLANK LINE>
+<why this change was made>
+<BLANK LINE>
+<footer>
+```
+
+The first line is the subject and should be no longer than 70 characters, the
+second line is always blank, and other lines should be wrapped at 80 characters.
+This allows the message to be easier to read on GitHub as well as in various
+git tools.
+
+
+[disclosure]: https://coreos.com/security/disclosure/
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 00000000..092076ea
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,4 @@
+[root]
+name = "coreos-metadata"
+version = "0.1.0"
+
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 00000000..6513a7b9
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "coreos-metadata"
+version = "0.1.0"
+authors = ["Stephen Demos <stephen.demos@coreos.com>"]
+
+[dependencies]
diff --git a/DCO b/DCO
new file mode 100644
index 00000000..716561d5
--- /dev/null
+++ b/DCO
@@ -0,0 +1,36 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..e06d2081
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 00000000..571695f5
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+CoreOS Project
+Copyright 2017 CoreOS, Inc
+
+This product includes software developed at CoreOS, Inc.
+(http://www.coreos.com/).
diff --git a/code-of-conduct.md b/code-of-conduct.md
new file mode 100644
index 00000000..c0c20dd8
--- /dev/null
+++ b/code-of-conduct.md
@@ -0,0 +1,63 @@
+## CoreOS Community Code of Conduct
+
+### Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing others' private information, such as physical or electronic addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct. By adopting this Code of Conduct,
+project maintainers commit themselves to fairly and consistently applying these
+principles to every aspect of managing this project. Project maintainers who do
+not follow or enforce the Code of Conduct may be permanently removed from the
+project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer, Brandon Philips
+<brandon.philips@coreos.com>, and/or Meghan Schofield
+<meghan.schofield@coreos.com>.
+
+This Code of Conduct is adapted from the Contributor Covenant
+(http://contributor-covenant.org), version 1.2.0, available at
+http://contributor-covenant.org/version/1/2/0/
+
+### CoreOS Events Code of Conduct
+
+CoreOS events are working conferences intended for professional networking and
+collaboration in the CoreOS community. Attendees are expected to behave
+according to professional standards and in accordance with their employer’s
+policies on appropriate workplace behavior.
+
+While at CoreOS events or related social networking opportunities, attendees
+should not engage in discriminatory or offensive speech or actions including
+but not limited to gender, sexuality, race, age, disability, or religion.
+Speakers should be especially aware of these concerns.
+
+CoreOS does not condone any statements by speakers contrary to these standards.
+CoreOS reserves the right to deny entrance and/or eject from an event (without
+refund) any individual found to be engaging in discriminatory or offensive
+speech or actions.
+
+Please bring any concerns to the immediate attention of designated on-site
+staff, Brandon Philips <brandon.philips@coreos.com>, and/or Meghan Schofield
+<meghan.schofield@coreos.com>.
diff --git a/src/main.rs b/src/main.rs
new file mode 100644
index 00000000..ca73330f
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,17 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+fn main() {
+    println!("Hello, world!");
+}

From 0c080e2fec250ab2182f8e1de8a0a0fb30661e33 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 21 Jul 2017 17:48:08 -0700
Subject: [PATCH 03/71] cargo: added clap and slog

these are two dependencies which are needed to start development on the
new version of coreos-metadata.
---
 Cargo.lock | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml |   5 +
 2 files changed, 295 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 092076ea..cf0f7ad1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,4 +1,294 @@
 [root]
 name = "coreos-metadata"
 version = "0.1.0"
+dependencies = [
+ "clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-async 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-term 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
+[[package]]
+name = "ansi_term"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "atty"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "bitflags"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "chrono"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "clap"
+version = "2.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "isatty"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "kernel32-sys"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "lazy_static"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "num"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "slog"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "slog-async"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "take_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "slog-scope"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "slog-term"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "strsim"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "take_mut"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "term"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "term_size"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread_local"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "time"
+version = "0.1.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unreachable"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "vec_map"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "void"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-build"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
+"checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
+"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
+"checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
+"checksum clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "867a885995b4184be051b70a592d4d70e32d7a188db6e8dff626af286a962771"
+"checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
+"checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
+"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+"checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
+"checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503"
+"checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525"
+"checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba"
+"checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
+"checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0"
+"checksum redox_syscall 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "9df6a71a1e67be2104410736b2389fb8e383c1d7e9e792d629ff13c02867147a"
+"checksum slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "057f354e538bfb65380f06810d2ab85933872563b20f53daa8144e5beae3aa3b"
+"checksum slog-async 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afbebab3918ccc36e83dca6879dbe554fc2874d1c26e3dd5debf646a5ee60936"
+"checksum slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd3236e1818c147ed3003930289dc6457425aaca3a7dbb6b7f3032f075d865c5"
+"checksum slog-term 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8734c9ff9a45be6026599e15aad5c29c2beb35113488b6945391853a011690"
+"checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
+"checksum take_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7986ceb18a0d75e1fcb8b27c0119389bbe05f016e5a6e54d003251acc1122108"
+"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
+"checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
+"checksum textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f86300c3e7416ee233abd7cda890c492007a3980f941f79185c753a701257167"
+"checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
+"checksum time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d788d3aa77bc0ef3e9621256885555368b47bd495c13dd2e7413c89f845520"
+"checksum unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18127285758f0e2c6cf325bb3f3d138a12fee27de4f23e146cd6a179f26c2cf3"
+"checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
+"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
diff --git a/Cargo.toml b/Cargo.toml
index 6513a7b9..1dbd5088 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,3 +4,8 @@ version = "0.1.0"
 authors = ["Stephen Demos <stephen.demos@coreos.com>"]
 
 [dependencies]
+clap = "*"
+slog = "*"
+slog-term = "*"
+slog-async = "*"
+slog-scope = "*"

From 04ff629f34352364a7e6d9902868391e1bd798df Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 21 Jul 2017 17:52:06 -0700
Subject: [PATCH 04/71] main: simple cli mimicking golang coreos-metadata

this implementation just implements the command-line tool. it is mostly
not implemented still.
---
 src/main.rs | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 110 insertions(+), 1 deletion(-)

diff --git a/src/main.rs b/src/main.rs
index ca73330f..d423c6a7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,6 +12,115 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[macro_use]
+extern crate clap;
+#[macro_use]
+extern crate slog;
+extern crate slog_term;
+extern crate slog_async;
+#[macro_use]
+extern crate slog_scope;
+
+use std::fs::File;
+use std::io::prelude::*;
+use clap::{Arg, App};
+use slog::Drain;
+
+const CMDLINE_PATH: &'static str = "/proc/cmdline";
+const CMDLINE_OEM_FLAG:&'static str = "coreos.oem.id";
+
+#[derive(Debug)]
+struct Config {
+    provider: String,
+    attributes_file: Option<String>,
+    ssh_keys_user: Option<String>,
+    hostname_file: Option<String>,
+    network_units_dir: Option<String>,
+}
+
 fn main() {
-    println!("Hello, world!");
+    // setup logging
+    let decorator = slog_term::TermDecorator::new().build();
+    let drain = slog_term::FullFormat::new(decorator).build().fuse();
+    let drain = slog_async::Async::new(drain).build().fuse();
+    let log = slog::Logger::root(drain, slog_o!());
+    let _guard = slog_scope::set_global_logger(log);
+
+    debug!("Logging initialized");
+
+    let config = init().unwrap();
+    info!("{:?}", config)
+}
+
+fn init() -> Result<Config, String> {
+    // setup cli
+    let matches = App::new("coreos-metadata")
+        .version(crate_version!())
+        .arg(Arg::with_name("attributes")
+             .long("attributes")
+             .help("The file into which the metadata attributes are written")
+             .takes_value(true))
+        .arg(Arg::with_name("cmdline")
+             .long("cmdline")
+             .help("Read the cloud provider from the kernel cmdline"))
+        .arg(Arg::with_name("hostname")
+             .long("hostname")
+             .help("The file into which the hostname should be written")
+             .takes_value(true))
+        .arg(Arg::with_name("network-units")
+             .long("network-units")
+             .help("The directory into which network units are written")
+             .takes_value(true))
+        .arg(Arg::with_name("provider")
+             .long("provider")
+             .help("The name of the cloud provider")
+             .takes_value(true))
+        .arg(Arg::with_name("ssh-keys")
+             .long("ssh-keys")
+             .help("Update SSH keys for the given user")
+             .takes_value(true))
+        .get_matches();
+
+    // return configuration
+    Ok(Config {
+        provider: match matches.value_of("provider") {
+            Some(provider) => String::from(provider),
+            None => if matches.is_present("cmdline") {
+                get_oem()?
+            } else {
+                return Err("Must set either --provider or --cmdline".to_string());
+            }
+        },
+        attributes_file: matches.value_of("attributes").map(String::from),
+        ssh_keys_user: matches.value_of("ssh-keys").map(String::from),
+        hostname_file: matches.value_of("hostname").map(String::from),
+        network_units_dir: matches.value_of("network-units").map(String::from),
+    })
+}
+
+fn get_oem() -> Result<String, String> {
+    // open the cmdline file
+    let mut file = File::open(CMDLINE_PATH)
+        .map_err(|err| format!("Failed to open cmdline file ({}) - {}", CMDLINE_PATH, err))?;
+
+    // read the contents
+    let mut contents = String::new();
+    file.read_to_string(&mut contents)
+        .map_err(|err| format!("Failed to read cmdline file ({}) - {}", CMDLINE_PATH, err))?;
+
+    // split the contents into elements
+    let params: Vec<Vec<&str>> = contents.split(' ')
+        .map(|s| s.split('=').collect())
+        .collect();
+
+    // find the oem flag
+    for p in params {
+        if p.len() > 1 && p[0] == CMDLINE_OEM_FLAG {
+            return Ok(String::from(p[1]));
+        }
+    }
+
+    // if we didn't find the oem flag then explode
+    // panic!("Couldn't find '{}' flag in cmdline file ({})", CMDLINE_OEM_FLAG, CMDLINE_PATH)
+    Err(format!("Couldn't find '{}' flag in cmdline file ({})", CMDLINE_OEM_FLAG, CMDLINE_PATH))
 }

From 6c6e03c806c1faf24c12518a159ce34c216759ad Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Sun, 23 Jul 2017 11:40:11 -0700
Subject: [PATCH 05/71] main: explicitly print configuration error

this is for easier debugging of the cli.
---
 Cargo.toml  |  5 ++++-
 src/main.rs | 13 +++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1dbd5088..7d1542d4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,10 @@ authors = ["Stephen Demos <stephen.demos@coreos.com>"]
 
 [dependencies]
 clap = "*"
-slog = "*"
 slog-term = "*"
 slog-async = "*"
 slog-scope = "*"
+
+[dependencies.slog]
+version = "*"
+features = ["max_level_trace"]
diff --git a/src/main.rs b/src/main.rs
index d423c6a7..871a0067 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -48,8 +48,15 @@ fn main() {
 
     debug!("Logging initialized");
 
-    let config = init().unwrap();
-    info!("{:?}", config)
+    let config = match init() {
+        Ok(config) => config,
+        Err(err) => {
+            error!("initialization"; "error" => err);
+            panic!()
+        }
+    };
+
+    trace!("cli configuration - {:?}", config);
 }
 
 fn init() -> Result<Config, String> {
@@ -120,7 +127,5 @@ fn get_oem() -> Result<String, String> {
         }
     }
 
-    // if we didn't find the oem flag then explode
-    // panic!("Couldn't find '{}' flag in cmdline file ({})", CMDLINE_OEM_FLAG, CMDLINE_PATH)
     Err(format!("Couldn't find '{}' flag in cmdline file ({})", CMDLINE_OEM_FLAG, CMDLINE_PATH))
 }

From 7eb6cc78bf487a81e14b8bbc47fdb3a974542db7 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 25 Jul 2017 11:08:40 -0700
Subject: [PATCH 06/71] main: added metadata fetching structure

this just adds a very simple first pass at how providers will be
structured. this is subject to change in future commits.
---
 src/main.rs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/main.rs b/src/main.rs
index 871a0067..b56ec255 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,6 +25,7 @@ use std::fs::File;
 use std::io::prelude::*;
 use clap::{Arg, App};
 use slog::Drain;
+use std::ops::Deref;
 
 const CMDLINE_PATH: &'static str = "/proc/cmdline";
 const CMDLINE_OEM_FLAG:&'static str = "coreos.oem.id";
@@ -38,6 +39,11 @@ struct Config {
     network_units_dir: Option<String>,
 }
 
+type Provider = fn() -> Result<Metadata, String>;
+
+struct Metadata {
+}
+
 fn main() {
     // setup logging
     let decorator = slog_term::TermDecorator::new().build();
@@ -57,6 +63,24 @@ fn main() {
     };
 
     trace!("cli configuration - {:?}", config);
+
+    // get the concrete provider from the configured value
+    let fetch = match get_metadata_fetch(config.provider) {
+        Ok(provider) => provider,
+        Err(err) => {
+            error!("getting provider"; "error" => err);
+            panic!()
+        }
+    };
+
+    // fetch the metadata from that provider
+    let _metadata = match fetch() {
+        Ok(metadata) => metadata,
+        Err(err) => {
+            error!("fetching metadata from provider"; "error" => err);
+            panic!()
+        }
+    };
 }
 
 fn init() -> Result<Config, String> {
@@ -129,3 +153,9 @@ fn get_oem() -> Result<String, String> {
 
     Err(format!("Couldn't find '{}' flag in cmdline file ({})", CMDLINE_OEM_FLAG, CMDLINE_PATH))
 }
+
+fn get_metadata_fetch(provider: String) -> Result<Provider, String> {
+    match provider.deref() {
+        _ => Err(format!("unknown provider '{}'", provider)),
+    }
+}

From b04675d403163692e37e4490da8450ee870ca60f Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 25 Jul 2017 14:11:19 -0700
Subject: [PATCH 07/71] main: call metadata writing functions

add basic functions for the metadata to actually output its information
in a predictable way for all providers. the functions aren't actually
implemented yet, but they are called by the main function.
---
 src/main.rs | 74 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 53 insertions(+), 21 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index b56ec255..03b083a2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -44,6 +44,30 @@ type Provider = fn() -> Result<Metadata, String>;
 struct Metadata {
 }
 
+impl Metadata {
+    pub fn write_attributes(&self, _attributes_file: String) -> Result<(), String> {
+        Err("not implemented".to_string())
+    }
+    pub fn write_ssh_keys(&self, _ssh_keys_user: String) -> Result<(), String> {
+        Err("not implemented".to_string())
+    }
+    pub fn write_hostname(&self, _hostname_file: String) -> Result<(), String> {
+        Err("not implemented".to_string())
+    }
+    pub fn write_network_units(&self, _network_units_dir: String) -> Result<(), String> {
+        Err("not implemented".to_string())
+    }
+}
+
+macro_rules! log_and_die {
+    ($x:expr) => {
+        |err| {
+            error!($x; "error" => err);
+            panic!()
+        }
+    };
+}
+
 fn main() {
     // setup logging
     let decorator = slog_term::TermDecorator::new().build();
@@ -54,33 +78,41 @@ fn main() {
 
     debug!("Logging initialized");
 
-    let config = match init() {
-        Ok(config) => config,
-        Err(err) => {
-            error!("initialization"; "error" => err);
-            panic!()
-        }
-    };
+    // initialize program
+    let config = init()
+        .unwrap_or_else(log_and_die!("initialization"));
 
     trace!("cli configuration - {:?}", config);
 
     // get the concrete provider from the configured value
-    let fetch = match get_metadata_fetch(config.provider) {
-        Ok(provider) => provider,
-        Err(err) => {
-            error!("getting provider"; "error" => err);
-            panic!()
-        }
-    };
+    let fetch = get_metadata_fetch(config.provider)
+        .unwrap_or_else(log_and_die!("getting provider"));
 
     // fetch the metadata from that provider
-    let _metadata = match fetch() {
-        Ok(metadata) => metadata,
-        Err(err) => {
-            error!("fetching metadata from provider"; "error" => err);
-            panic!()
-        }
-    };
+    let metadata = fetch()
+        .unwrap_or_else(log_and_die!("fetching metadata from provider"));
+
+    // write attributes if configured to do so
+    config.attributes_file
+        .map_or(Ok(()), |x| metadata.write_attributes(x))
+        .unwrap_or_else(log_and_die!("writing metadata attributes"));
+
+    // write ssh keys if configured to do so
+    config.ssh_keys_user
+        .map_or(Ok(()), |x| metadata.write_ssh_keys(x))
+        .unwrap_or_else(log_and_die!("writing metadata attributes"));
+
+    // write hostname if configured to do so
+    config.hostname_file
+        .map_or(Ok(()), |x| metadata.write_hostname(x))
+        .unwrap_or_else(log_and_die!("writing metadata attributes"));
+
+    // write network units if configured to do so
+    config.network_units_dir
+        .map_or(Ok(()), |x| metadata.write_network_units(x))
+        .unwrap_or_else(log_and_die!("writing metadata attributes"));
+
+    debug!("Done!")
 }
 
 fn init() -> Result<Config, String> {

From b954d10b3025073641b292180eaa49f1f4f0e9bc Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Wed, 9 Aug 2017 13:22:15 -0700
Subject: [PATCH 08/71] main: added implementations for metadata writers

this adds a relatively simple implementation of the functions that
output the metadata for all providers.
---
 Cargo.lock  |  10 ++++
 Cargo.toml  |   1 +
 src/main.rs | 141 +++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 144 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cf0f7ad1..69eff8c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,6 +7,7 @@ dependencies = [
  "slog-async 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-term 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "users 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -238,6 +239,14 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "users"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "vec_map"
 version = "0.8.0"
@@ -288,6 +297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18127285758f0e2c6cf325bb3f3d138a12fee27de4f23e146cd6a179f26c2cf3"
 "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum users 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7ae8fdf783cb9652109c99886459648feb92ecc749e6b8e7930f6decba74c7c"
 "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
diff --git a/Cargo.toml b/Cargo.toml
index 7d1542d4..ebede252 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Stephen Demos <stephen.demos@coreos.com>"]
 
 [dependencies]
 clap = "*"
+users = "*"
 slog-term = "*"
 slog-async = "*"
 slog-scope = "*"
diff --git a/src/main.rs b/src/main.rs
index 03b083a2..d15054dc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -20,12 +20,17 @@ extern crate slog_term;
 extern crate slog_async;
 #[macro_use]
 extern crate slog_scope;
+extern crate users;
 
+use std::fs;
 use std::fs::File;
+use std::path::{Path, PathBuf};
 use std::io::prelude::*;
 use clap::{Arg, App};
 use slog::Drain;
 use std::ops::Deref;
+use std::collections::HashMap;
+use users::os::unix::UserExt;
 
 const CMDLINE_PATH: &'static str = "/proc/cmdline";
 const CMDLINE_OEM_FLAG:&'static str = "coreos.oem.id";
@@ -42,20 +47,140 @@ struct Config {
 type Provider = fn() -> Result<Metadata, String>;
 
 struct Metadata {
+    attributes: HashMap<String, String>,
+    hostname: Option<String>,
+    ssh_keys: Vec<String>,
+    network: Vec<NetworkInterface>,
+    net_dev: Vec<NetworkDevice>,
+}
+
+struct NetworkInterface {
+}
+
+struct NetworkDevice{
+}
+
+impl NetworkInterface {
+    fn unit_name(&self) -> String {
+        String::new()
+    }
+    fn config(&self) -> String {
+        String::new()
+    }
+}
+
+impl NetworkDevice {
+    fn unit_name(&self) -> String {
+        String::new()
+    }
+    fn config(&self) -> String {
+        String::new()
+    }
+}
+
+fn create_file(filename: String) -> Result<File, String> {
+    let file_path = Path::new(&filename);
+    // create the directories if they don't exist
+    let folder = file_path.parent()
+        .ok_or(format!("could not get parent directory of {:?}", file_path))?;
+    fs::create_dir_all(&folder)
+        .map_err(|err| format!("failed to create directory {:?}: {:?}", folder, err))?;
+    // create (or truncate) the file we want to write to
+    File::create(file_path)
+        .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))
+}
+
+// this actually has to be a lot more complicate than this. We need to properly
+// interact with the existing go tooling, which uses lock files on disk to
+// ensure that only one program is manipulating the authorized keys
+// this whole part of the os is really weird.
+// for now, with this poc, just leave it like this.
+fn create_authorized_keys_dir(user: users::User) -> Result<PathBuf, String> {
+    // construct the path to the authorized keys directory
+    let ssh_dir = user.home_dir().join(".ssh");
+    let authorized_keys_dir = ssh_dir.join("authorized_keys.d");
+    // check if the authorized keys directory exists
+    if authorized_keys_dir.is_dir() {
+        // if it does, just return
+        return Ok(authorized_keys_dir);
+    }
+    // if it doesn't, create it
+    fs::create_dir_all(&authorized_keys_dir)
+        .map_err(|err| format!("failed to create directory {:?}: {:?}", authorized_keys_dir, err))?;
+    // check if there is an authorized keys file
+    let authorized_keys_file = ssh_dir.join("authorized_keys");
+    if authorized_keys_file.is_file() {
+        // if there is, copy it into the authorized keys directory
+        let preserved_keys_file = authorized_keys_dir.join("orig_authorzied_keys");
+        fs::copy(&authorized_keys_file, preserved_keys_file)
+            .map_err(|err| format!("failed to copy old authorzied keys file: {:?}", err))?;
+    }
+    // then we are done
+    Ok(authorized_keys_dir)
+}
+
+fn sync_authorized_keys(authorized_keys_dir: PathBuf) -> Result<(), String> {
+    let ssh_dir = authorized_keys_dir.parent()
+        .ok_or(format!("could not get parent directory of {:?}", authorized_keys_dir))?;
+    let authorized_keys_file = File::create(ssh_dir.join("authorized_keys"))
+        .map_err(|err| format!("failed to create file {:?}: {:?}", ssh_dir.join("authorized_keys"), err));
+    let dir = fs::read_dir(authorized_keys_dir)
+        .map_err(|err| format!("failed to read from directory {:?}: {:?}", authorized_keys_dir, err))?;
+    for entry in dir {
+
+    }
 }
 
 impl Metadata {
-    pub fn write_attributes(&self, _attributes_file: String) -> Result<(), String> {
-        Err("not implemented".to_string())
+    fn write_attributes(&self, attributes_file_path: String) -> Result<(), String> {
+        let mut attributes_file = create_file(attributes_file_path)?;
+        for (k,v) in &self.attributes {
+            write!(&mut attributes_file, "COREOS_{}={}\n", k, v)
+                .map_err(|err| format!("failed to write attributes to file {:?}: {:?}", attributes_file, err))?;
+        }
+        Ok(())
     }
-    pub fn write_ssh_keys(&self, _ssh_keys_user: String) -> Result<(), String> {
-        Err("not implemented".to_string())
+    fn write_ssh_keys(&self, ssh_keys_user: String) -> Result<(), String> {
+        let user = users::get_user_by_name(ssh_keys_user.as_str())
+            .ok_or(format!("could not find user with username {:?}", ssh_keys_user))?;
+        let authorized_keys_dir = create_authorized_keys_dir(user)?;
+        let mut authorized_keys_file = File::create(authorized_keys_dir.join("coreos-metadata"))
+            .map_err(|err| format!("failed to create the file {:?} in the ssh authorized users directory: {:?}", "coreos-metadata", err))?;
+        for ssh_key in &self.ssh_keys {
+            write!(&mut authorized_keys_file, "{}\n", ssh_key)
+                .map_err(|err| format!("failed to write ssh key to file {:?}: {:?}", authorized_keys_file, err))?;
+        }
+        sync_authorized_keys(authorized_keys_dir)
     }
-    pub fn write_hostname(&self, _hostname_file: String) -> Result<(), String> {
-        Err("not implemented".to_string())
+    fn write_hostname(&self, hostname_file_path: String) -> Result<(), String> {
+        match self.hostname {
+            Some(ref hostname) => {
+                let mut hostname_file = create_file(hostname_file_path)?;
+                write!(&mut hostname_file, "{}\n", hostname)
+                    .map_err(|err| format!("failed to write hostname {:?} to file {:?}: {:?}", self.hostname, hostname_file, err))
+            }
+            None => Ok(())
+        }
     }
-    pub fn write_network_units(&self, _network_units_dir: String) -> Result<(), String> {
-        Err("not implemented".to_string())
+    fn write_network_units(&self, network_units_dir: String) -> Result<(), String> {
+        let dir_path = Path::new(&network_units_dir);
+        fs::create_dir_all(&dir_path)
+            .map_err(|err| format!("failed to create directory {:?}: {:?}", dir_path, err))?;
+        for interface in &self.network {
+            let file_path = dir_path.join(interface.unit_name());
+            let mut unit_file = File::create(&file_path)
+                .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))?;
+            write!(&mut unit_file, "{}", interface.config())
+                .map_err(|err| format!("failed to write network interface unit file {:?}: {:?}", unit_file, err))?;
+        }
+        for device in &self.net_dev {
+            let file_path = dir_path.join(device.unit_name());
+            let mut unit_file = File::create(&file_path)
+                .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))?;
+            write!(&mut unit_file, "{}", device.config())
+                .map_err(|err| format!("failed to write network device unit file {:?}: {:?}", unit_file, err))?;
+        }
+        Ok(())
     }
 }
 

From e23ced50f79f2cfb6e8ee3f1677fc30c87592f39 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Thu, 10 Aug 2017 16:49:49 -0700
Subject: [PATCH 09/71] *: break out functionality into multiple files

this provides better structure for the functionality so that I'm not
just working in one giant main file the whole time.
---
 src/main.rs     | 163 ++----------------------------------------------
 src/metadata.rs | 107 +++++++++++++++++++++++++++++++
 src/network.rs  |  72 +++++++++++++++++++++
 src/ssh.rs      |  81 ++++++++++++++++++++++++
 4 files changed, 266 insertions(+), 157 deletions(-)
 create mode 100644 src/metadata.rs
 create mode 100644 src/network.rs
 create mode 100644 src/ssh.rs

diff --git a/src/main.rs b/src/main.rs
index d15054dc..d1a3907d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -22,15 +22,14 @@ extern crate slog_async;
 extern crate slog_scope;
 extern crate users;
 
-use std::fs;
+mod metadata;
+mod ssh;
+mod network;
+
 use std::fs::File;
-use std::path::{Path, PathBuf};
 use std::io::prelude::*;
 use clap::{Arg, App};
 use slog::Drain;
-use std::ops::Deref;
-use std::collections::HashMap;
-use users::os::unix::UserExt;
 
 const CMDLINE_PATH: &'static str = "/proc/cmdline";
 const CMDLINE_OEM_FLAG:&'static str = "coreos.oem.id";
@@ -44,146 +43,6 @@ struct Config {
     network_units_dir: Option<String>,
 }
 
-type Provider = fn() -> Result<Metadata, String>;
-
-struct Metadata {
-    attributes: HashMap<String, String>,
-    hostname: Option<String>,
-    ssh_keys: Vec<String>,
-    network: Vec<NetworkInterface>,
-    net_dev: Vec<NetworkDevice>,
-}
-
-struct NetworkInterface {
-}
-
-struct NetworkDevice{
-}
-
-impl NetworkInterface {
-    fn unit_name(&self) -> String {
-        String::new()
-    }
-    fn config(&self) -> String {
-        String::new()
-    }
-}
-
-impl NetworkDevice {
-    fn unit_name(&self) -> String {
-        String::new()
-    }
-    fn config(&self) -> String {
-        String::new()
-    }
-}
-
-fn create_file(filename: String) -> Result<File, String> {
-    let file_path = Path::new(&filename);
-    // create the directories if they don't exist
-    let folder = file_path.parent()
-        .ok_or(format!("could not get parent directory of {:?}", file_path))?;
-    fs::create_dir_all(&folder)
-        .map_err(|err| format!("failed to create directory {:?}: {:?}", folder, err))?;
-    // create (or truncate) the file we want to write to
-    File::create(file_path)
-        .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))
-}
-
-// this actually has to be a lot more complicate than this. We need to properly
-// interact with the existing go tooling, which uses lock files on disk to
-// ensure that only one program is manipulating the authorized keys
-// this whole part of the os is really weird.
-// for now, with this poc, just leave it like this.
-fn create_authorized_keys_dir(user: users::User) -> Result<PathBuf, String> {
-    // construct the path to the authorized keys directory
-    let ssh_dir = user.home_dir().join(".ssh");
-    let authorized_keys_dir = ssh_dir.join("authorized_keys.d");
-    // check if the authorized keys directory exists
-    if authorized_keys_dir.is_dir() {
-        // if it does, just return
-        return Ok(authorized_keys_dir);
-    }
-    // if it doesn't, create it
-    fs::create_dir_all(&authorized_keys_dir)
-        .map_err(|err| format!("failed to create directory {:?}: {:?}", authorized_keys_dir, err))?;
-    // check if there is an authorized keys file
-    let authorized_keys_file = ssh_dir.join("authorized_keys");
-    if authorized_keys_file.is_file() {
-        // if there is, copy it into the authorized keys directory
-        let preserved_keys_file = authorized_keys_dir.join("orig_authorzied_keys");
-        fs::copy(&authorized_keys_file, preserved_keys_file)
-            .map_err(|err| format!("failed to copy old authorzied keys file: {:?}", err))?;
-    }
-    // then we are done
-    Ok(authorized_keys_dir)
-}
-
-fn sync_authorized_keys(authorized_keys_dir: PathBuf) -> Result<(), String> {
-    let ssh_dir = authorized_keys_dir.parent()
-        .ok_or(format!("could not get parent directory of {:?}", authorized_keys_dir))?;
-    let authorized_keys_file = File::create(ssh_dir.join("authorized_keys"))
-        .map_err(|err| format!("failed to create file {:?}: {:?}", ssh_dir.join("authorized_keys"), err));
-    let dir = fs::read_dir(authorized_keys_dir)
-        .map_err(|err| format!("failed to read from directory {:?}: {:?}", authorized_keys_dir, err))?;
-    for entry in dir {
-
-    }
-}
-
-impl Metadata {
-    fn write_attributes(&self, attributes_file_path: String) -> Result<(), String> {
-        let mut attributes_file = create_file(attributes_file_path)?;
-        for (k,v) in &self.attributes {
-            write!(&mut attributes_file, "COREOS_{}={}\n", k, v)
-                .map_err(|err| format!("failed to write attributes to file {:?}: {:?}", attributes_file, err))?;
-        }
-        Ok(())
-    }
-    fn write_ssh_keys(&self, ssh_keys_user: String) -> Result<(), String> {
-        let user = users::get_user_by_name(ssh_keys_user.as_str())
-            .ok_or(format!("could not find user with username {:?}", ssh_keys_user))?;
-        let authorized_keys_dir = create_authorized_keys_dir(user)?;
-        let mut authorized_keys_file = File::create(authorized_keys_dir.join("coreos-metadata"))
-            .map_err(|err| format!("failed to create the file {:?} in the ssh authorized users directory: {:?}", "coreos-metadata", err))?;
-        for ssh_key in &self.ssh_keys {
-            write!(&mut authorized_keys_file, "{}\n", ssh_key)
-                .map_err(|err| format!("failed to write ssh key to file {:?}: {:?}", authorized_keys_file, err))?;
-        }
-        sync_authorized_keys(authorized_keys_dir)
-    }
-    fn write_hostname(&self, hostname_file_path: String) -> Result<(), String> {
-        match self.hostname {
-            Some(ref hostname) => {
-                let mut hostname_file = create_file(hostname_file_path)?;
-                write!(&mut hostname_file, "{}\n", hostname)
-                    .map_err(|err| format!("failed to write hostname {:?} to file {:?}: {:?}", self.hostname, hostname_file, err))
-            }
-            None => Ok(())
-        }
-    }
-    fn write_network_units(&self, network_units_dir: String) -> Result<(), String> {
-        let dir_path = Path::new(&network_units_dir);
-        fs::create_dir_all(&dir_path)
-            .map_err(|err| format!("failed to create directory {:?}: {:?}", dir_path, err))?;
-        for interface in &self.network {
-            let file_path = dir_path.join(interface.unit_name());
-            let mut unit_file = File::create(&file_path)
-                .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))?;
-            write!(&mut unit_file, "{}", interface.config())
-                .map_err(|err| format!("failed to write network interface unit file {:?}: {:?}", unit_file, err))?;
-        }
-        for device in &self.net_dev {
-            let file_path = dir_path.join(device.unit_name());
-            let mut unit_file = File::create(&file_path)
-                .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))?;
-            write!(&mut unit_file, "{}", device.config())
-                .map_err(|err| format!("failed to write network device unit file {:?}: {:?}", unit_file, err))?;
-        }
-        Ok(())
-    }
-}
-
 macro_rules! log_and_die {
     ($x:expr) => {
         |err| {
@@ -209,12 +68,8 @@ fn main() {
 
     trace!("cli configuration - {:?}", config);
 
-    // get the concrete provider from the configured value
-    let fetch = get_metadata_fetch(config.provider)
-        .unwrap_or_else(log_and_die!("getting provider"));
-
-    // fetch the metadata from that provider
-    let metadata = fetch()
+    // fetch the metadata from the configured provider
+    let metadata = metadata::fetch_metadata(&config.provider)
         .unwrap_or_else(log_and_die!("fetching metadata from provider"));
 
     // write attributes if configured to do so
@@ -310,9 +165,3 @@ fn get_oem() -> Result<String, String> {
 
     Err(format!("Couldn't find '{}' flag in cmdline file ({})", CMDLINE_OEM_FLAG, CMDLINE_PATH))
 }
-
-fn get_metadata_fetch(provider: String) -> Result<Provider, String> {
-    match provider.deref() {
-        _ => Err(format!("unknown provider '{}'", provider)),
-    }
-}
diff --git a/src/metadata.rs b/src/metadata.rs
new file mode 100644
index 00000000..546f36ea
--- /dev/null
+++ b/src/metadata.rs
@@ -0,0 +1,107 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fs;
+use std::fs::File;
+use std::path::Path;
+use std::io::prelude::*;
+use std::collections::HashMap;
+use users;
+use ssh;
+use network;
+
+pub struct Metadata {
+    attributes: HashMap<String, String>,
+    hostname: Option<String>,
+    ssh_keys: Vec<String>,
+    network: Vec<network::Interface>,
+    net_dev: Vec<network::Device>,
+}
+
+fn create_file(filename: String) -> Result<File, String> {
+    let file_path = Path::new(&filename);
+    // create the directories if they don't exist
+    let folder = file_path.parent()
+        .ok_or(format!("could not get parent directory of {:?}", file_path))?;
+    fs::create_dir_all(&folder)
+        .map_err(|err| format!("failed to create directory {:?}: {:?}", folder, err))?;
+    // create (or truncate) the file we want to write to
+    File::create(file_path)
+        .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))
+}
+
+impl Metadata {
+    pub fn write_attributes(&self, attributes_file_path: String) -> Result<(), String> {
+        let mut attributes_file = create_file(attributes_file_path)?;
+        for (k,v) in &self.attributes {
+            write!(&mut attributes_file, "COREOS_{}={}\n", k, v)
+                .map_err(|err| format!("failed to write attributes to file {:?}: {:?}", attributes_file, err))?;
+        }
+        Ok(())
+    }
+    pub fn write_ssh_keys(&self, ssh_keys_user: String) -> Result<(), String> {
+        // this function actually needs to be pretty complicated
+        // and we need a new tool that does this generically for rust anyway
+        // so I actually just have to rewrite update-ssh-keys
+        let user = users::get_user_by_name(ssh_keys_user.as_str())
+            .ok_or(format!("could not find user with username {:?}", ssh_keys_user))?;
+        let authorized_keys_dir = ssh::create_authorized_keys_dir(user)?;
+        let mut authorized_keys_file = File::create(authorized_keys_dir.join("coreos-metadata"))
+            .map_err(|err| format!("failed to create the file {:?} in the ssh authorized users directory: {:?}", "coreos-metadata", err))?;
+        for ssh_key in &self.ssh_keys {
+            write!(&mut authorized_keys_file, "{}\n", ssh_key)
+                .map_err(|err| format!("failed to write ssh key to file {:?}: {:?}", authorized_keys_file, err))?;
+        }
+        ssh::sync_authorized_keys(authorized_keys_dir)
+    }
+    pub fn write_hostname(&self, hostname_file_path: String) -> Result<(), String> {
+        match self.hostname {
+            Some(ref hostname) => {
+                let mut hostname_file = create_file(hostname_file_path)?;
+                write!(&mut hostname_file, "{}\n", hostname)
+                    .map_err(|err| format!("failed to write hostname {:?} to file {:?}: {:?}", self.hostname, hostname_file, err))
+            }
+            None => Ok(())
+        }
+    }
+    pub fn write_network_units(&self, network_units_dir: String) -> Result<(), String> {
+        let dir_path = Path::new(&network_units_dir);
+        fs::create_dir_all(&dir_path)
+            .map_err(|err| format!("failed to create directory {:?}: {:?}", dir_path, err))?;
+        for interface in &self.network {
+            let file_path = dir_path.join(interface.unit_name());
+            let mut unit_file = File::create(&file_path)
+                .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))?;
+            write!(&mut unit_file, "{}", interface.config())
+                .map_err(|err| format!("failed to write network interface unit file {:?}: {:?}", unit_file, err))?;
+        }
+        for device in &self.net_dev {
+            let file_path = dir_path.join(device.unit_name());
+            let mut unit_file = File::create(&file_path)
+                .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))?;
+            write!(&mut unit_file, "{}", device.config())
+                .map_err(|err| format!("failed to write network device unit file {:?}: {:?}", unit_file, err))?;
+        }
+        Ok(())
+    }
+}
+
+/// fetch_metadata is the generic, top-level function that is used by the main
+/// function to fetch metadata. The configured provider is passed in and this
+/// function dispatches the call to the correct provider-specific fetch function
+pub fn fetch_metadata(provider: &str) -> Result<Metadata, String> {
+    match provider {
+        _ => Err(format!("unknown provider '{}'", provider)),
+    }
+}
diff --git a/src/network.rs b/src/network.rs
new file mode 100644
index 00000000..04f57972
--- /dev/null
+++ b/src/network.rs
@@ -0,0 +1,72 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! network deals abstracts away the manipulation of network device and
+//! interface unit files. All that is left is to write the resulting string to
+//! the necessary unit.
+
+use std::net::IpAddr;
+
+pub struct IpNetwork {
+    addr: IpAddr,
+    prefix: u8,
+}
+
+pub struct NetworkRoute {
+    destination: IpNetwork,
+    gateway: IpAddr,
+}
+
+pub struct MacAddr(pub u8, pub u8, pub u8,pub u8, pub u8, pub u8, pub u8, pub u8);
+
+pub struct Interface {
+    name: String,
+    mac_address: MacAddr,
+    priority: u32,
+    nameservers: Vec<IpAddr>,
+    ip_addresses: Vec<IpNetwork>,
+    routes: Vec<NetworkRoute>,
+    bond: String
+}
+
+pub struct Section {
+    name: String,
+    attributes: Vec<(String, String)>,
+}
+
+pub struct Device {
+    name: String,
+    kind: String,
+    mac_address: MacAddr,
+    priority: u32,
+    sections: Vec<Section>
+}
+
+impl Interface {
+    pub fn unit_name(&self) -> String {
+        String::new()
+    }
+    pub fn config(&self) -> String {
+        String::new()
+    }
+}
+
+impl Device {
+    pub fn unit_name(&self) -> String {
+        String::new()
+    }
+    pub fn config(&self) -> String {
+        String::new()
+    }
+}
diff --git a/src/ssh.rs b/src/ssh.rs
new file mode 100644
index 00000000..1036c59f
--- /dev/null
+++ b/src/ssh.rs
@@ -0,0 +1,81 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! ssh manipulates the authorized_keys directory and file
+//! TODO(sdemos):
+//! right now this doesn't do the file locking expected by the other tools which manipulate this directory
+//! for testing purposes, I'll leave it that way for now. If this ever gets used in real life, fix this somehow.
+//! the real fix is https://bugzilla.mindrot.org/show_bug.cgi?id=2755 but if that doesn't make it in, the
+//! second best fix is to rewrite `update-ssh-keys` in rust as a library/binary combo
+
+use std::fs;
+use std::fs::File;
+use std::path::PathBuf;
+use std::io::prelude::*;
+use users::os::unix::UserExt;
+use users;
+
+pub fn create_authorized_keys_dir(user: users::User) -> Result<PathBuf, String> {
+    // construct the path to the authorized keys directory
+    let ssh_dir = user.home_dir().join(".ssh");
+    let authorized_keys_dir = ssh_dir.join("authorized_keys.d");
+    // check if the authorized keys directory exists
+    if authorized_keys_dir.is_dir() {
+        // if it does, just return
+        return Ok(authorized_keys_dir);
+    }
+    // if it doesn't, create it
+    fs::create_dir_all(&authorized_keys_dir)
+        .map_err(|err| format!("failed to create directory {:?}: {:?}", authorized_keys_dir, err))?;
+    // check if there is an authorized keys file
+    let authorized_keys_file = ssh_dir.join("authorized_keys");
+    if authorized_keys_file.is_file() {
+        // if there is, copy it into the authorized keys directory
+        let preserved_keys_file = authorized_keys_dir.join("orig_authorzied_keys");
+        fs::copy(&authorized_keys_file, preserved_keys_file)
+            .map_err(|err| format!("failed to copy old authorzied keys file: {:?}", err))?;
+    }
+    // then we are done
+    Ok(authorized_keys_dir)
+}
+
+pub fn sync_authorized_keys(authorized_keys_dir: PathBuf) -> Result<(), String> {
+    let ssh_dir = authorized_keys_dir.parent()
+        .ok_or(format!("could not get parent directory of {:?}", authorized_keys_dir))?;
+    let mut authorized_keys_file = File::create(ssh_dir.join("authorized_keys"))
+        .map_err(|err| format!("failed to create file {:?}: {:?}", ssh_dir.join("authorized_keys"), err))?;
+    flatten_dir(&mut authorized_keys_file, &authorized_keys_dir)
+}
+
+fn flatten_dir(mut file: &mut File, dir: &PathBuf) -> Result<(), String> {
+    let dir_contents = fs::read_dir(&dir)
+        .map_err(|err| format!("failed to read from directory {:?}: {:?}", dir, err))?;
+    for entry in dir_contents {
+        let entry = entry.map_err(|err| format!("failed to read entry in directory {:?}: {:?}", dir, err))?;
+        let path = entry.path();
+        if path.is_dir() {
+            // if it's a directory, recurse into it
+            flatten_dir(&mut file, &path)?;
+        } else {
+            let mut from = File::open(&path)
+                .map_err(|err| format!("failed to open file {:?}: {:?}", path, err))?;
+            let mut contents = String::new();
+            from.read_to_string(&mut contents)
+                .map_err(|err| format!("failed to read file {:?}: {:?}", path, err))?;
+            write!(&mut file, "{}\n", contents)
+                .map_err(|err| format!("failed to write to file {:?}: {:?}", file, err))?;
+        }
+    }
+    Ok(())
+}

From 0829c1263f0b51ceda9dcf43819f165d97a97f2d Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 11 Aug 2017 14:07:35 -0700
Subject: [PATCH 10/71] network: write network interface/device units

this writes out network information gathered from the provider into
network unit files.
---
 src/network.rs | 93 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 84 insertions(+), 9 deletions(-)

diff --git a/src/network.rs b/src/network.rs
index 04f57972..a7f88fa6 100644
--- a/src/network.rs
+++ b/src/network.rs
@@ -17,56 +17,131 @@
 //! the necessary unit.
 
 use std::net::IpAddr;
+use std::fmt;
+use std::string::String;
+use std::string::ToString;
 
+#[derive(Clone, Copy, Debug)]
 pub struct IpNetwork {
     addr: IpAddr,
     prefix: u8,
 }
 
+impl fmt::Display for IpNetwork {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}/{}", self.addr, self.prefix)
+    }
+}
+
+#[derive(Clone, Copy, Debug)]
 pub struct NetworkRoute {
     destination: IpNetwork,
     gateway: IpAddr,
 }
 
+#[derive(Clone, Copy, Debug)]
 pub struct MacAddr(pub u8, pub u8, pub u8,pub u8, pub u8, pub u8, pub u8, pub u8);
 
+impl fmt::Display for MacAddr {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:x}:{:x}:{:x}:{:x}:{:x}:{:x}:{:x}:{:x}", self.0, self.1, self.2, self.3, self.4, self.5, self.6, self.7)
+    }
+}
+
+/// for naming purposes an interface needs either a name or an address.
+/// it can have both. but it can't have neither.
+/// there isn't really a way to express this in the type system
+/// so we just panic! if it's not what we expected.
+/// I guess that there aren't really type systems with inclusive disjunction
+/// so it's not really that big of a deal.
+#[derive(Clone, Debug)]
 pub struct Interface {
-    name: String,
-    mac_address: MacAddr,
-    priority: u32,
+    name: Option<String>,
+    mac_address: Option<MacAddr>,
+    priority: Option<u32>,
     nameservers: Vec<IpAddr>,
     ip_addresses: Vec<IpNetwork>,
     routes: Vec<NetworkRoute>,
-    bond: String
+    bond: Option<String>,
 }
 
+#[derive(Clone, Debug)]
 pub struct Section {
     name: String,
     attributes: Vec<(String, String)>,
 }
 
+#[derive(Clone, Debug)]
 pub struct Device {
     name: String,
     kind: String,
     mac_address: MacAddr,
-    priority: u32,
+    priority: Option<u32>,
     sections: Vec<Section>
 }
 
 impl Interface {
     pub fn unit_name(&self) -> String {
-        String::new()
+        format!("{:02}-{}.network",
+                self.priority.unwrap_or(10),
+                self.name.clone().unwrap_or(
+                    self.mac_address.unwrap_or_else(
+                        // needs to be a lambda or we panic immediately
+                        // yay, manual thunking!
+                        ||panic!("interface needs either name or mac address (or both)")
+                    ).to_string()
+                ))
     }
     pub fn config(&self) -> String {
-        String::new()
+        let mut config = String::new();
+
+        // [Match] section
+        config.push_str("[Match]\n");
+        self.name.clone().map(|name| config.push_str(&format!("Name={}\n", name)));
+        self.mac_address.map(|mac| config.push_str(&format!("MACAddress={}\n", mac)));
+
+        // [Network] section
+        config.push_str("\n[Network]\n");
+        for ns in &self.nameservers {
+            config.push_str(&format!("DNS={}\n", ns))
+        }
+        self.bond.clone().map(|bond| config.push_str(&format!("Bond={}\n", bond)));
+
+        // [Address] sections
+        for addr in &self.ip_addresses {
+            config.push_str(&format!("\n[Address]\nAddress={}\n", addr));
+        }
+
+        // [Route] sections
+        for route in &self.routes {
+            config.push_str(&format!("\n[Route]\nDestination={}\nGateway={}\n", route.destination, route.gateway));
+        }
+
+        config
     }
 }
 
 impl Device {
     pub fn unit_name(&self) -> String {
-        String::new()
+        format!("{:02}-{}.netdev", self.priority.unwrap_or(10), self.name)
     }
     pub fn config(&self) -> String {
-        String::new()
+        let mut config = String::new();
+
+        // [NetDev] section
+        config.push_str("[NetDev]\n");
+        config.push_str(&format!("Name={}\n", self.name));
+        config.push_str(&format!("Kind={}\n", self.kind));
+        config.push_str(&format!("MACAddress={}\n", self.mac_address));
+
+        // custom sections
+        for section in &self.sections {
+            config.push_str(&format!("\n[{}]\n", section.name));
+            for attr in &section.attributes {
+                config.push_str(&format!("{}={}\n", attr.0, attr.1));
+            }
+        }
+
+        config
     }
 }

From e09031b09198849b1946f284524d515cbf12391d Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 11 Aug 2017 14:24:14 -0700
Subject: [PATCH 11/71] macros: added more comprehensive error handling

we don't want to deal with all the error handling boilerplate all over
the place, so use automatically formatting macros.
---
 src/macros.rs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 src/macros.rs

diff --git a/src/macros.rs b/src/macros.rs
new file mode 100644
index 00000000..358db858
--- /dev/null
+++ b/src/macros.rs
@@ -0,0 +1,56 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! macros for use across the coreos-metadata project
+
+#[macro_export]
+macro_rules! log_and_die {
+    () => {
+        |err| {
+            error!("error"; "error" => err);
+            panic!()
+        }
+    };
+    ($fmt:expr) => {
+        |err| {
+            error!($fmt; "error" => err);
+            panic!()
+        }
+    };
+    ($fmt:expr, $($arg:tt)*) => {
+        |err| {
+            error!($fmt, $($arg)*; "error" => err);
+            panic!()
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! wrap_error {
+    () => {
+        |err| {
+            format!("error: {}", err)
+        }
+    };
+    ($fmt:expr) => {
+        |err| {
+            format!(concat!($fmt, ": {}"), err)
+        }
+    };
+    ($fmt:expr, $($arg:tt)*) => {
+        |err| {
+            format!(concat!($fmt, ": {}"), $($arg)*, err)
+        }
+    };
+}

From aff1b74140143b22b6a7ae570cbecf8be917a666 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 11 Aug 2017 14:24:31 -0700
Subject: [PATCH 12/71] *: convert to new error handling macros

this reduces a lot of the boilerplate in our error handling.
---
 src/main.rs     | 15 ++++-----------
 src/metadata.rs | 22 +++++++++++-----------
 src/ssh.rs      | 16 ++++++++--------
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index d1a3907d..836eddfc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -22,6 +22,8 @@ extern crate slog_async;
 extern crate slog_scope;
 extern crate users;
 
+#[macro_use]
+mod macros;
 mod metadata;
 mod ssh;
 mod network;
@@ -43,15 +45,6 @@ struct Config {
     network_units_dir: Option<String>,
 }
 
-macro_rules! log_and_die {
-    ($x:expr) => {
-        |err| {
-            error!($x; "error" => err);
-            panic!()
-        }
-    };
-}
-
 fn main() {
     // setup logging
     let decorator = slog_term::TermDecorator::new().build();
@@ -144,12 +137,12 @@ fn init() -> Result<Config, String> {
 fn get_oem() -> Result<String, String> {
     // open the cmdline file
     let mut file = File::open(CMDLINE_PATH)
-        .map_err(|err| format!("Failed to open cmdline file ({}) - {}", CMDLINE_PATH, err))?;
+        .map_err(wrap_error!("Failed to open cmdline file ({})", CMDLINE_PATH))?;
 
     // read the contents
     let mut contents = String::new();
     file.read_to_string(&mut contents)
-        .map_err(|err| format!("Failed to read cmdline file ({}) - {}", CMDLINE_PATH, err))?;
+        .map_err(wrap_error!("Failed to read cmdline file ({})", CMDLINE_PATH))?;
 
     // split the contents into elements
     let params: Vec<Vec<&str>> = contents.split(' ')
diff --git a/src/metadata.rs b/src/metadata.rs
index 546f36ea..8f79fdd7 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -35,10 +35,10 @@ fn create_file(filename: String) -> Result<File, String> {
     let folder = file_path.parent()
         .ok_or(format!("could not get parent directory of {:?}", file_path))?;
     fs::create_dir_all(&folder)
-        .map_err(|err| format!("failed to create directory {:?}: {:?}", folder, err))?;
+        .map_err(wrap_error!("failed to create directory {:?}", folder))?;
     // create (or truncate) the file we want to write to
     File::create(file_path)
-        .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))
+        .map_err(wrap_error!("failed to create file {:?}", file_path))
 }
 
 impl Metadata {
@@ -46,7 +46,7 @@ impl Metadata {
         let mut attributes_file = create_file(attributes_file_path)?;
         for (k,v) in &self.attributes {
             write!(&mut attributes_file, "COREOS_{}={}\n", k, v)
-                .map_err(|err| format!("failed to write attributes to file {:?}: {:?}", attributes_file, err))?;
+                .map_err(wrap_error!("failed to write attributes to file {:?}", attributes_file))?;
         }
         Ok(())
     }
@@ -58,10 +58,10 @@ impl Metadata {
             .ok_or(format!("could not find user with username {:?}", ssh_keys_user))?;
         let authorized_keys_dir = ssh::create_authorized_keys_dir(user)?;
         let mut authorized_keys_file = File::create(authorized_keys_dir.join("coreos-metadata"))
-            .map_err(|err| format!("failed to create the file {:?} in the ssh authorized users directory: {:?}", "coreos-metadata", err))?;
+            .map_err(wrap_error!("failed to create the file {:?} in the ssh authorized users directory", "coreos-metadata"))?;
         for ssh_key in &self.ssh_keys {
             write!(&mut authorized_keys_file, "{}\n", ssh_key)
-                .map_err(|err| format!("failed to write ssh key to file {:?}: {:?}", authorized_keys_file, err))?;
+                .map_err(wrap_error!("failed to write ssh key to file {:?}", authorized_keys_file))?;
         }
         ssh::sync_authorized_keys(authorized_keys_dir)
     }
@@ -70,7 +70,7 @@ impl Metadata {
             Some(ref hostname) => {
                 let mut hostname_file = create_file(hostname_file_path)?;
                 write!(&mut hostname_file, "{}\n", hostname)
-                    .map_err(|err| format!("failed to write hostname {:?} to file {:?}: {:?}", self.hostname, hostname_file, err))
+                    .map_err(wrap_error!("failed to write hostname {:?} to file {:?}", self.hostname, hostname_file))
             }
             None => Ok(())
         }
@@ -78,20 +78,20 @@ impl Metadata {
     pub fn write_network_units(&self, network_units_dir: String) -> Result<(), String> {
         let dir_path = Path::new(&network_units_dir);
         fs::create_dir_all(&dir_path)
-            .map_err(|err| format!("failed to create directory {:?}: {:?}", dir_path, err))?;
+            .map_err(wrap_error!("failed to create directory {:?}", dir_path))?;
         for interface in &self.network {
             let file_path = dir_path.join(interface.unit_name());
             let mut unit_file = File::create(&file_path)
-                .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))?;
+                .map_err(wrap_error!("failed to create file {:?}", file_path))?;
             write!(&mut unit_file, "{}", interface.config())
-                .map_err(|err| format!("failed to write network interface unit file {:?}: {:?}", unit_file, err))?;
+                .map_err(wrap_error!("failed to write network interface unit file {:?}", unit_file))?;
         }
         for device in &self.net_dev {
             let file_path = dir_path.join(device.unit_name());
             let mut unit_file = File::create(&file_path)
-                .map_err(|err| format!("failed to create file {:?}: {:?}", file_path, err))?;
+                .map_err(wrap_error!("failed to create file {:?}", file_path))?;
             write!(&mut unit_file, "{}", device.config())
-                .map_err(|err| format!("failed to write network device unit file {:?}: {:?}", unit_file, err))?;
+                .map_err(wrap_error!("failed to write network device unit file {:?}", unit_file))?;
         }
         Ok(())
     }
diff --git a/src/ssh.rs b/src/ssh.rs
index 1036c59f..f8a204a5 100644
--- a/src/ssh.rs
+++ b/src/ssh.rs
@@ -37,14 +37,14 @@ pub fn create_authorized_keys_dir(user: users::User) -> Result<PathBuf, String>
     }
     // if it doesn't, create it
     fs::create_dir_all(&authorized_keys_dir)
-        .map_err(|err| format!("failed to create directory {:?}: {:?}", authorized_keys_dir, err))?;
+        .map_err(wrap_error!("failed to create directory {:?}", authorized_keys_dir))?;
     // check if there is an authorized keys file
     let authorized_keys_file = ssh_dir.join("authorized_keys");
     if authorized_keys_file.is_file() {
         // if there is, copy it into the authorized keys directory
         let preserved_keys_file = authorized_keys_dir.join("orig_authorzied_keys");
         fs::copy(&authorized_keys_file, preserved_keys_file)
-            .map_err(|err| format!("failed to copy old authorzied keys file: {:?}", err))?;
+            .map_err(wrap_error!("failed to copy old authorzied keys file"))?;
     }
     // then we are done
     Ok(authorized_keys_dir)
@@ -54,27 +54,27 @@ pub fn sync_authorized_keys(authorized_keys_dir: PathBuf) -> Result<(), String>
     let ssh_dir = authorized_keys_dir.parent()
         .ok_or(format!("could not get parent directory of {:?}", authorized_keys_dir))?;
     let mut authorized_keys_file = File::create(ssh_dir.join("authorized_keys"))
-        .map_err(|err| format!("failed to create file {:?}: {:?}", ssh_dir.join("authorized_keys"), err))?;
+        .map_err(wrap_error!("failed to create file {:?}", ssh_dir.join("authorized_keys")))?;
     flatten_dir(&mut authorized_keys_file, &authorized_keys_dir)
 }
 
 fn flatten_dir(mut file: &mut File, dir: &PathBuf) -> Result<(), String> {
     let dir_contents = fs::read_dir(&dir)
-        .map_err(|err| format!("failed to read from directory {:?}: {:?}", dir, err))?;
+        .map_err(wrap_error!("failed to read from directory {:?}", dir))?;
     for entry in dir_contents {
-        let entry = entry.map_err(|err| format!("failed to read entry in directory {:?}: {:?}", dir, err))?;
+        let entry = entry.map_err(wrap_error!("failed to read entry in directory {:?}", dir))?;
         let path = entry.path();
         if path.is_dir() {
             // if it's a directory, recurse into it
             flatten_dir(&mut file, &path)?;
         } else {
             let mut from = File::open(&path)
-                .map_err(|err| format!("failed to open file {:?}: {:?}", path, err))?;
+                .map_err(wrap_error!("failed to open file {:?}", path))?;
             let mut contents = String::new();
             from.read_to_string(&mut contents)
-                .map_err(|err| format!("failed to read file {:?}: {:?}", path, err))?;
+                .map_err(wrap_error!("failed to read file {:?}", path))?;
             write!(&mut file, "{}\n", contents)
-                .map_err(|err| format!("failed to write to file {:?}: {:?}", file, err))?;
+                .map_err(wrap_error!("failed to write to file {:?}", file))?;
         }
     }
     Ok(())

From 74a3dff9f4be3d0a9615a189c4b39248fe2287ae Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 11 Aug 2017 16:54:16 -0700
Subject: [PATCH 13/71] network: added unit tests

these are basic unit tests, but the cover a lot of stuff. this as still
yet to be tested with an actual provider though.
---
 src/network.rs | 257 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 251 insertions(+), 6 deletions(-)

diff --git a/src/network.rs b/src/network.rs
index a7f88fa6..65f1109a 100644
--- a/src/network.rs
+++ b/src/network.rs
@@ -40,11 +40,11 @@ pub struct NetworkRoute {
 }
 
 #[derive(Clone, Copy, Debug)]
-pub struct MacAddr(pub u8, pub u8, pub u8,pub u8, pub u8, pub u8, pub u8, pub u8);
+pub struct MacAddr(pub u8, pub u8, pub u8,pub u8, pub u8, pub u8);
 
 impl fmt::Display for MacAddr {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:x}:{:x}:{:x}:{:x}:{:x}:{:x}:{:x}:{:x}", self.0, self.1, self.2, self.3, self.4, self.5, self.6, self.7)
+        write!(f, "{:02x}:{:02x}:{:02x}:{:02x}:{:02x}:{:02x}", self.0, self.1, self.2, self.3, self.4, self.5)
     }
 }
 
@@ -84,10 +84,10 @@ impl Interface {
     pub fn unit_name(&self) -> String {
         format!("{:02}-{}.network",
                 self.priority.unwrap_or(10),
-                self.name.clone().unwrap_or(
-                    self.mac_address.unwrap_or_else(
-                        // needs to be a lambda or we panic immediately
-                        // yay, manual thunking!
+                self.name.clone().unwrap_or_else(
+                    // needs to be a lambda or we panic immediately
+                    // yay, manual thunking!
+                    ||self.mac_address.unwrap_or_else(
                         ||panic!("interface needs either name or mac address (or both)")
                     ).to_string()
                 ))
@@ -145,3 +145,248 @@ impl Device {
         config
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::net::{Ipv4Addr, Ipv6Addr};
+
+    #[test]
+    fn mac_addr_display() {
+        let m = MacAddr(0xf4,0x00,0x34,0x09,0x73,0xee);
+        assert_eq!(m.to_string(), "f4:00:34:09:73:ee");
+    }
+
+    #[test]
+    fn ip_network_display() {
+        let ips = vec![
+            (IpNetwork {
+                addr: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
+                prefix: 8,
+            }, "127.0.0.1/8"),
+            (IpNetwork {
+                addr: IpAddr::V4(Ipv4Addr::new(129, 21, 50, 131)),
+                prefix: 32,
+            }, "129.21.50.131/32"),
+            (IpNetwork {
+                addr: IpAddr::V6(Ipv6Addr::new(0xfe80, 0, 0, 0, 0xf696, 0x34ff, 0xfe09, 0x7347)),
+                prefix: 64,
+            }, "fe80::f696:34ff:fe09:7347/64"),
+            (IpNetwork {
+                addr: IpAddr::V6(Ipv6Addr::new(0,0,0,0,0,0,0,1)),
+                prefix: 128,
+            }, "::1/128")
+        ];
+
+        for (ip, s) in ips {
+            assert_eq!(ip.to_string(), s);
+        }
+    }
+
+    #[test]
+    fn interface_unit_name() {
+        let is = vec![
+            (Interface {
+                name: Some(String::from("lo")),
+                mac_address: Some(MacAddr(0,0,0,0,0,0)),
+                priority: Some(20),
+                nameservers: vec![],
+                ip_addresses: vec![],
+                routes: vec![],
+                bond: None,
+            }, "20-lo.network"),
+            (Interface {
+                name: Some(String::from("lo")),
+                mac_address: Some(MacAddr(0,0,0,0,0,0)),
+                priority: None,
+                nameservers: vec![],
+                ip_addresses: vec![],
+                routes: vec![],
+                bond: None,
+            }, "10-lo.network"),
+            (Interface {
+                name: None,
+                mac_address: Some(MacAddr(0,0,0,0,0,0)),
+                priority: Some(20),
+                nameservers: vec![],
+                ip_addresses: vec![],
+                routes: vec![],
+                bond: None,
+            }, "20-00:00:00:00:00:00.network"),
+            (Interface {
+                name: Some(String::from("lo")),
+                mac_address: None,
+                priority: Some(20),
+                nameservers: vec![],
+                ip_addresses: vec![],
+                routes: vec![],
+                bond: None,
+            }, "20-lo.network"),
+        ];
+
+        for (i, s) in is {
+            assert_eq!(i.unit_name(), s);
+        }
+    }
+
+    #[test]
+    #[should_panic]
+    fn interface_unit_name_no_name_no_mac() {
+        let i = Interface {
+            name: None,
+            mac_address: None,
+            priority: Some(20),
+            nameservers: vec![],
+            ip_addresses: vec![],
+            routes: vec![],
+            bond: None,
+        };
+        let _name = i.unit_name();
+    }
+
+    #[test]
+    fn device_unit_name() {
+        let ds = vec![
+            (Device {
+                name: String::from("vlan0"),
+                kind: String::from("vlan"),
+                mac_address: MacAddr(0,0,0,0,0,0),
+                priority: Some(20),
+                sections: vec![],
+            }, "20-vlan0.netdev"),
+            (Device {
+                name: String::from("vlan0"),
+                kind: String::from("vlan"),
+                mac_address: MacAddr(0,0,0,0,0,0),
+                priority: None,
+                sections: vec![],
+            }, "10-vlan0.netdev"),
+        ];
+
+        for (d, s) in ds {
+            assert_eq!(d.unit_name(), s);
+        }
+    }
+
+    #[test]
+    fn interface_config() {
+        let is = vec![
+            (Interface {
+                name: Some(String::from("lo")),
+                mac_address: Some(MacAddr(0,0,0,0,0,0)),
+                priority: Some(20),
+                nameservers: vec![
+                    IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
+                    IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)),
+                ],
+                ip_addresses: vec![
+                    IpNetwork {
+                        addr: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
+                        prefix: 8,
+                    },
+                    IpNetwork {
+                        addr: IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)),
+                        prefix: 128,
+                    }
+                ],
+                routes: vec![
+                    NetworkRoute {
+                        destination: IpNetwork {
+                            addr: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
+                            prefix: 8,
+                        },
+                        gateway: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
+                    }
+                ],
+                bond: Some(String::from("james")),
+            }, "[Match]
+Name=lo
+MACAddress=00:00:00:00:00:00
+
+[Network]
+DNS=127.0.0.1
+DNS=::1
+Bond=james
+
+[Address]
+Address=127.0.0.1/8
+
+[Address]
+Address=::1/128
+
+[Route]
+Destination=127.0.0.1/8
+Gateway=127.0.0.1
+"),
+            // this isn't really a valid interface object, but it's testing
+            // the minimum possible configuration for all peices at the same
+            // time, so I'll allow it. (sdemos)
+            (Interface {
+                name: None,
+                mac_address: None,
+                priority: None,
+                nameservers: vec![],
+                ip_addresses: vec![],
+                routes: vec![],
+                bond: None,
+            }, "[Match]
+
+[Network]
+")
+        ];
+
+        for (i, s) in is {
+            assert_eq!(i.config(), s);
+        }
+    }
+
+    #[test]
+    fn device_config() {
+        let ds = vec![
+            (Device {
+                name: String::from("vlan0"),
+                kind: String::from("vlan"),
+                mac_address: MacAddr(0,0,0,0,0,0),
+                priority: Some(20),
+                sections: vec![
+                    Section {
+                        name: String::from("Test"),
+                        attributes: vec![
+                            (String::from("foo"), String::from("bar")),
+                            (String::from("oingo"), String::from("boingo")),
+                        ]
+                    },
+                    Section {
+                        name: String::from("Empty"),
+                        attributes: vec![],
+                    }
+                ],
+            }, "[NetDev]
+Name=vlan0
+Kind=vlan
+MACAddress=00:00:00:00:00:00
+
+[Test]
+foo=bar
+oingo=boingo
+
+[Empty]
+"),
+            (Device {
+                name: String::from("vlan0"),
+                kind: String::from("vlan"),
+                mac_address: MacAddr(0,0,0,0,0,0),
+                priority: Some(20),
+                sections: vec![],
+            }, "[NetDev]
+Name=vlan0
+Kind=vlan
+MACAddress=00:00:00:00:00:00
+")
+        ];
+
+        for (d, s) in ds {
+            assert_eq!(d.config(), s);
+        }
+    }
+}

From b0c02b779e131261721fcb40c22300f78ed56a23 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 11 Aug 2017 18:05:27 -0700
Subject: [PATCH 14/71] *: restructure library, add metadata builder

the metadata builder allows us to construct metadata types easier
without having to rely on the internals of the struct. also, the library
approach decouples the fetching of metadata and the functionality of the
command line tool.
---
 src/{main.rs => bin/coreos-metadata.rs} |  9 ++--
 src/lib.rs                              | 43 +++++++++++++++++
 src/metadata.rs                         | 64 +++++++++++++++++++++----
 3 files changed, 102 insertions(+), 14 deletions(-)
 rename src/{main.rs => bin/coreos-metadata.rs} (97%)
 create mode 100644 src/lib.rs

diff --git a/src/main.rs b/src/bin/coreos-metadata.rs
similarity index 97%
rename from src/main.rs
rename to src/bin/coreos-metadata.rs
index 836eddfc..b9e67e4e 100644
--- a/src/main.rs
+++ b/src/bin/coreos-metadata.rs
@@ -23,16 +23,15 @@ extern crate slog_scope;
 extern crate users;
 
 #[macro_use]
-mod macros;
-mod metadata;
-mod ssh;
-mod network;
+extern crate coreos_metadata;
 
 use std::fs::File;
 use std::io::prelude::*;
 use clap::{Arg, App};
 use slog::Drain;
 
+use coreos_metadata::fetch_metadata;
+
 const CMDLINE_PATH: &'static str = "/proc/cmdline";
 const CMDLINE_OEM_FLAG:&'static str = "coreos.oem.id";
 
@@ -62,7 +61,7 @@ fn main() {
     trace!("cli configuration - {:?}", config);
 
     // fetch the metadata from the configured provider
-    let metadata = metadata::fetch_metadata(&config.provider)
+    let metadata = fetch_metadata(&config.provider)
         .unwrap_or_else(log_and_die!("fetching metadata from provider"));
 
     // write attributes if configured to do so
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 00000000..3df21533
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,43 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[macro_use]
+extern crate hyper;
+
+#[macro_use]
+extern crate serde_derive;
+extern crate serde;
+extern crate serde_xml_rs;
+
+extern crate openssl;
+
+extern crate users;
+
+#[macro_use]
+mod macros;
+mod providers;
+mod metadata;
+mod ssh;
+mod network;
+
+use metadata::Metadata;
+
+/// fetch_metadata is the generic, top-level function that is used by the main
+/// function to fetch metadata. The configured provider is passed in and this
+/// function dispatches the call to the correct provider-specific fetch function
+pub fn fetch_metadata(provider: &str) -> Result<Metadata, String> {
+    match provider {
+        _ => Err(format!("unknown provider '{}'", provider)),
+    }
+}
diff --git a/src/metadata.rs b/src/metadata.rs
index 8f79fdd7..36a81e28 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -21,6 +21,10 @@ use users;
 use ssh;
 use network;
 
+pub struct MetadataBuilder {
+    metadata: Metadata,
+}
+
 pub struct Metadata {
     attributes: HashMap<String, String>,
     hostname: Option<String>,
@@ -41,7 +45,58 @@ fn create_file(filename: String) -> Result<File, String> {
         .map_err(wrap_error!("failed to create file {:?}", file_path))
 }
 
+impl MetadataBuilder {
+    pub fn new() -> Self {
+        MetadataBuilder {
+            metadata: Metadata::new(),
+        }
+    }
+
+    pub fn add_attribute(mut self, key: String, value: String) -> Self {
+        self.metadata.attributes.insert(key, value);
+        self
+    }
+
+    pub fn set_hostname(mut self, hostname: String) -> Self {
+        self.metadata.hostname = Some(hostname);
+        self
+    }
+
+    pub fn add_ssh_key(mut self, ssh_key: String) -> Self {
+        self.metadata.ssh_keys.push(ssh_key);
+        self
+    }
+
+    pub fn add_network_interface(mut self, interface: network::Interface) -> Self {
+        self.metadata.network.push(interface);
+        self
+    }
+
+    pub fn add_network_device(mut self, device: network::Device) -> Self {
+        self.metadata.net_dev.push(device);
+        self
+    }
+
+    pub fn build(self) -> Metadata {
+        self.metadata
+    }
+}
+
 impl Metadata {
+    pub fn builder() -> MetadataBuilder {
+        MetadataBuilder::new()
+    }
+
+    pub fn new() -> Self {
+        Metadata {
+            attributes: HashMap::new(),
+            hostname: None,
+            ssh_keys: vec![],
+            network: vec![],
+            net_dev: vec![],
+        }
+    }
+
     pub fn write_attributes(&self, attributes_file_path: String) -> Result<(), String> {
         let mut attributes_file = create_file(attributes_file_path)?;
         for (k,v) in &self.attributes {
@@ -96,12 +151,3 @@ impl Metadata {
         Ok(())
     }
 }
-
-/// fetch_metadata is the generic, top-level function that is used by the main
-/// function to fetch metadata. The configured provider is passed in and this
-/// function dispatches the call to the correct provider-specific fetch function
-pub fn fetch_metadata(provider: &str) -> Result<Metadata, String> {
-    match provider {
-        _ => Err(format!("unknown provider '{}'", provider)),
-    }
-}

From c1cf63ebe262939dfedb3df67cc443dea35baab4 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 11 Aug 2017 18:06:44 -0700
Subject: [PATCH 15/71] providers: added azure ssh-keys support

this is the first provider to be implemented. this adds all of the
dependencies and the functionality needed to decrypt the ssh keys given
to us by the azure metadata service. the code should be well commented
enough to explain exactly what has to be done to actually get the
information (it's not straightforward).
---
 Cargo.lock                         | 326 +++++++++++++++++++++++++++++
 Cargo.toml                         |  12 ++
 src/lib.rs                         |   2 +
 src/providers/azure/crypto/mod.rs  |  85 ++++++++
 src/providers/azure/crypto/ssh.rs  | 103 +++++++++
 src/providers/azure/crypto/x509.rs | 150 +++++++++++++
 src/providers/azure/mod.rs         | 193 +++++++++++++++++
 src/providers/mod.rs               |  26 +++
 8 files changed, 897 insertions(+)
 create mode 100644 src/providers/azure/crypto/mod.rs
 create mode 100644 src/providers/azure/crypto/ssh.rs
 create mode 100644 src/providers/azure/crypto/x509.rs
 create mode 100644 src/providers/azure/mod.rs
 create mode 100644 src/providers/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index 69eff8c6..20934519 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,7 +2,15 @@
 name = "coreos-metadata"
 version = "0.1.0"
 dependencies = [
+ "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.9.15",
+ "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde-xml-rs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -25,11 +33,38 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "base64"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "base64"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "bitflags"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bitflags"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "byteorder"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "chrono"
 version = "0.4.0"
@@ -60,6 +95,49 @@ name = "crossbeam"
 version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "foreign-types"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "gcc"
+version = "0.3.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "httparse"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "hyper"
+version = "0.10.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "idna"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "isatty"
 version = "0.1.3"
@@ -79,6 +157,11 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "language-tags"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lazy_static"
 version = "0.2.8"
@@ -89,6 +172,32 @@ name = "libc"
 version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "log"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "matches"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "mime"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num"
 version = "0.1.40"
@@ -121,11 +230,106 @@ name = "num-traits"
 version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "num_cpus"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "openssl"
+version = "0.9.15"
+dependencies = [
+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.15",
+]
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.15"
+dependencies = [
+ "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "quote"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "redox_syscall"
 version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "rustc_version"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "safemem"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "semver"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde-xml-rs"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "slog"
 version = "2.0.6"
@@ -168,6 +372,24 @@ name = "strsim"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "syn"
+version = "0.11.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "synom"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "take_mut"
 version = "0.1.3"
@@ -221,6 +443,45 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "traitobject"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "typeable"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicase"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicase"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.1.0"
@@ -231,6 +492,11 @@ name = "unicode-width"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "unicode-xid"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unreachable"
 version = "1.0.0"
@@ -239,6 +505,16 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "url"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "users"
 version = "0.5.2"
@@ -252,6 +528,11 @@ name = "vec_map"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "version_check"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "void"
 version = "1.0.2"
@@ -267,38 +548,83 @@ name = "winapi-build"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "xml-rs"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [metadata]
 "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
 "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
+"checksum base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30e93c03064e7590d0466209155251b90c22e37fab1daf2771582598b5827557"
+"checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
+"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
+"checksum byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d"
 "checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
 "checksum clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "867a885995b4184be051b70a592d4d70e32d7a188db6e8dff626af286a962771"
 "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
+"checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
+"checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a"
+"checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
+"checksum hyper 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)" = "0f01e4a20f5dfa5278d7762b7bdb7cab96e24378b9eca3889fbd4b5e94dc7063"
+"checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
 "checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
 "checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503"
+"checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
+"checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
+"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
+"checksum mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "153f98dde2b135dece079e5478ee400ae1bab13afa52d66590eacfc40e912435"
 "checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525"
 "checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba"
 "checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
 "checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0"
+"checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584"
+"checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356"
+"checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum redox_syscall 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "9df6a71a1e67be2104410736b2389fb8e383c1d7e9e792d629ff13c02867147a"
+"checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
+"checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
+"checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
+"checksum serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f7726f29ddf9731b17ff113c461e362c381d9d69433f79de4f3dd572488823e9"
+"checksum serde-xml-rs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fce1909691944ee6e9b9e6da69dee5d61e37e5b2fa0b85543d8529412f86f6e"
+"checksum serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cf823e706be268e73e7747b147aa31c8f633ab4ba31f115efb57e5047c3a76dd"
+"checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a"
 "checksum slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "057f354e538bfb65380f06810d2ab85933872563b20f53daa8144e5beae3aa3b"
 "checksum slog-async 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afbebab3918ccc36e83dca6879dbe554fc2874d1c26e3dd5debf646a5ee60936"
 "checksum slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd3236e1818c147ed3003930289dc6457425aaca3a7dbb6b7f3032f075d865c5"
 "checksum slog-term 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8734c9ff9a45be6026599e15aad5c29c2beb35113488b6945391853a011690"
 "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
 "checksum take_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7986ceb18a0d75e1fcb8b27c0119389bbe05f016e5a6e54d003251acc1122108"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
 "checksum textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f86300c3e7416ee233abd7cda890c492007a3980f941f79185c753a701257167"
 "checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
 "checksum time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d788d3aa77bc0ef3e9621256885555368b47bd495c13dd2e7413c89f845520"
+"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
+"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+"checksum unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e01da42520092d0cd2d6ac3ae69eb21a22ad43ff195676b86f8c37f487d6b80"
+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+"checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
 "checksum unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18127285758f0e2c6cf325bb3f3d138a12fee27de4f23e146cd6a179f26c2cf3"
 "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27"
 "checksum users 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7ae8fdf783cb9652109c99886459648feb92ecc749e6b8e7930f6decba74c7c"
 "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
+"checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+"checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562"
diff --git a/Cargo.toml b/Cargo.toml
index ebede252..82f3b23e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,18 @@ users = "*"
 slog-term = "*"
 slog-async = "*"
 slog-scope = "*"
+# use an old version of hyper
+# because the new ones are weird
+hyper = "0.10"
+mime = "0.3"
+serde = "1.0"
+serde_derive = "1.0"
+serde-xml-rs = "0.2"
+# use my fork of openssl until my changes are released
+# they are merged into master, just waiting on a tag
+openssl = { path = "/home/demos/projects/rust-openssl/openssl" }
+base64 = "0.6"
+byteorder = "1.1"
 
 [dependencies.slog]
 version = "*"
diff --git a/src/lib.rs b/src/lib.rs
index 3df21533..9f485b79 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -31,6 +31,7 @@ mod metadata;
 mod ssh;
 mod network;
 
+use providers::*;
 use metadata::Metadata;
 
 /// fetch_metadata is the generic, top-level function that is used by the main
@@ -38,6 +39,7 @@ use metadata::Metadata;
 /// function dispatches the call to the correct provider-specific fetch function
 pub fn fetch_metadata(provider: &str) -> Result<Metadata, String> {
     match provider {
+        "azure" => azure::fetch_metadata(),
         _ => Err(format!("unknown provider '{}'", provider)),
     }
 }
diff --git a/src/providers/azure/crypto/mod.rs b/src/providers/azure/crypto/mod.rs
new file mode 100644
index 00000000..d8a766a9
--- /dev/null
+++ b/src/providers/azure/crypto/mod.rs
@@ -0,0 +1,85 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! crypto module takes care of cryptographic functions
+
+pub mod x509;
+pub mod ssh;
+
+use openssl::x509::X509;
+use openssl::pkey::PKey;
+use openssl::cms::CmsContentInfo;
+use openssl::pkcs12::Pkcs12;
+
+macro_rules! wrap_error {
+    ($x:expr) => {
+        |err| {
+            format!("{}: {}", $x, err)
+        }
+    };
+}
+
+pub fn mangle_pem(x509: &X509) -> Result<String, String> {
+    // get the pem
+    let pem = x509.to_pem()
+        .map_err(wrap_error!("failed to convert x509 cert to pem"))?;
+    let pem = String::from_utf8(pem)
+        .map_err(wrap_error!("failed to convert x509 pem file from utf8 to a string"))?;
+
+    // the pem needs to be mangled to send as a header
+    Ok(pem.lines()
+        .filter(|l| !l.contains("BEGIN CERTIFICATE") && !l.contains("END CERTIFICATE"))
+        .fold(String::new(), |mut s, l| {s.push_str(l); s}))
+}
+
+pub fn decrypt_cms(smime: &[u8], pkey: &PKey, x509: &X509) -> Result<Vec<u8>, String> {
+    // now we need to read in that mime file
+    let cms = CmsContentInfo::smime_read_cms(smime)
+        .map_err(wrap_error!("failed to read cms file"))?;
+
+    // and decrypt it's contents
+    let p12_der = cms.decrypt(&pkey, &x509)
+        .map_err(wrap_error!("failed to decrypt cms file"))?;
+
+    Ok(p12_der)
+}
+
+pub fn p12_to_ssh_pubkey(p12_der: &[u8]) -> Result<String, String> {
+    // the contents of that encrypted cms blob we got are actually a different
+    // cryptographic structure. we read that in from the contents and parse it.
+    // PKCS12 has the ability to have a password, but we don't have one, hence
+    // empty string.
+    let p12 = Pkcs12::from_der(&p12_der)
+        .map_err(wrap_error!("failed to get pkcs12 blob from der"))?;
+    let p12 = p12.parse("")
+        .map_err(wrap_error!("failed to parse pkcs12 blob"))?;
+
+    // PKCS12 has three parts. A pkey, a main x509 cert, and a list of other
+    // x509 certs. The list of other x509 certs is called the chain. there is
+    // only one cert in this chain, and it is the ssh public key.
+    let ssh_pubkey_pem = p12.chain.get(0).unwrap();
+    // .map_err(wrap_error!("failed to get cert from pkcs12 chain"))?;
+    let ssh_pubkey_pem = ssh_pubkey_pem.public_key() // get the public key from the x509 cert
+        .map_err(wrap_error!("failed to get public key from cert"))?;
+    let ssh_pubkey_pem = ssh_pubkey_pem.rsa()        // get the rsa contents from the pkey struct
+        .map_err(wrap_error!("failed to get rsa contents from pkey"))?;
+
+    // so now I have a pkey struct which represents my rsa public key. This is
+    // my ssh public key. However, I can only export it in pem or der. Ther are
+    // no existing rust (or go for that matter) libraries which do the
+    // conversion I want, so I guess I'll have to write my own function to do it
+    let ssh_pubkey = ssh::rsa_to_ssh(&ssh_pubkey_pem, "");
+
+    Ok(ssh_pubkey)
+}
diff --git a/src/providers/azure/crypto/ssh.rs b/src/providers/azure/crypto/ssh.rs
new file mode 100644
index 00000000..28914ee5
--- /dev/null
+++ b/src/providers/azure/crypto/ssh.rs
@@ -0,0 +1,103 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! OpenSSH Public Keys
+//!
+//! This crate converts to and from OpenSSH Public Keys. Right now, there is
+//! just decoding from generic RSA to OpenSSH Public Key format.
+//!
+//! To use this library:
+//!
+//! ```
+//! extern crate openssl;
+//! extern crate ssh;
+//!
+//! use openssl::rsa::Rsa;
+//!
+//! let rsa = Rsa::generate(2048).unwrap();
+//! let ssh_pubkey = ssh::rsa_to_ssh(rsa, "user@host");
+//! println!("my ssh public key: {}", ssh_pubkey);
+//! ```
+
+extern crate base64;
+extern crate byteorder;
+extern crate openssl;
+
+use self::byteorder::{WriteBytesExt, BigEndian};
+
+use openssl::rsa::Rsa;
+use openssl::bn;
+
+// an ssh key consists of three pieces:
+//    ssh-keytype data comment
+// our ssh-keytype is ssh-rsa.
+// the data also consists of three pieces (for an rsa key):
+//    ssh-rsa public-exponent modulus
+// each of those is encoded as big-endian bytes preceeded by four bytes
+// representing their length.
+// for details:
+// see ssh-rsa format in https://tools.ietf.org/html/rfc4253#section-6.6
+pub fn rsa_to_ssh(rsa: &Rsa, comment: &str) -> String {
+    // first it has the keytype
+    let keytype = "ssh-rsa";
+    let mut key = encode_ssh(keytype.as_bytes().to_vec());
+
+    // then it has the encoded public exponent
+    let e = rsa.e().unwrap();
+    key.append(&mut encode_mpint(e));
+
+    // last it has the endcoded modulus
+    let n = rsa.n().unwrap();
+    key.append(&mut encode_mpint(n));
+
+    // the data section is base64 encoded
+    let data = base64::encode(&key);
+
+    format!("{} {} {}", keytype, data, comment)
+}
+
+// according to RFC 4251, the mpint datatype representation is a big-endian
+// arbitrary-precision integer stored in two's compliment and stored as a
+// string with the minimum possible number of characters.
+// see mpint definition in https://tools.ietf.org/html/rfc4251#section-5
+fn encode_mpint(num: &bn::BigNumRef) -> Vec<u8> {
+    // bignum.to_vec() gives big-endian results
+    let mut buf = num.to_vec();
+
+    // If the number is positive (which ours are going to be because of the rsa
+    // spec), then we are required to guarentee that the most significant bit is
+    // set to zero if the first bit in the first byte is going to be one.
+    if buf.get(0).unwrap() & 0x80 != 0 {
+        buf.insert(0, 0);
+    }
+
+    // other than that it's just normal ssh encoding
+    encode_ssh(buf)
+}
+
+// a datatype in ssh is encoded as 4 bytes representing the size, followed by
+// the data itself, all in big-endian. Since we don't really the endian-ness of
+// the provided Vec<u8>, we just assume it's correct and worry about the length.
+fn encode_ssh(mut buf: Vec<u8>) -> Vec<u8> {
+    let mut encoded: Vec<u8> = Vec::new();
+
+    // The first four bytes represent the length of the encoded data.
+    // BigEndian::write_u32(&mut encoded, buf.len() as u32);
+    encoded.write_u32::<BigEndian>(buf.len() as u32).unwrap();
+
+    // the rest of the bytes are the data itself
+    encoded.append(&mut buf);
+
+    encoded
+}
diff --git a/src/providers/azure/crypto/x509.rs b/src/providers/azure/crypto/x509.rs
new file mode 100644
index 00000000..22e26eaa
--- /dev/null
+++ b/src/providers/azure/crypto/x509.rs
@@ -0,0 +1,150 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Generate X509 certificate and associated RSA public/private keypair
+
+extern crate openssl;
+
+use openssl::x509::{X509, X509Name};
+use openssl::rsa::Rsa;
+use openssl::pkey::PKey;
+use openssl::hash::MessageDigest;
+use openssl::asn1::Asn1Time;
+use openssl::bn;
+use openssl::conf::{Conf, ConfMethod};
+use openssl::x509::extension;
+
+macro_rules! wrap_error {
+    ($x:expr) => {
+        |err| {
+            format!("{}: {}", $x, err)
+        }
+    };
+}
+
+pub struct Config {
+    rsa_bits: u32,
+    expire_in_days: u32,
+}
+
+impl Config {
+    pub fn new(rsa_bits: u32, expire_in_days: u32) -> Self {
+        Config {
+            rsa_bits: rsa_bits,
+            expire_in_days: expire_in_days,
+        }
+    }
+}
+
+pub fn generate_cert(config: Config) -> Result<(X509, PKey), String> {
+    // generate an rsa public/private keypair
+    let rsa = Rsa::generate(config.rsa_bits)
+        .map_err(wrap_error!("failed to generate rsa keypair"))?;
+    // put it into the pkey struct
+    let pkey = PKey::from_rsa(rsa)
+        .map_err(wrap_error!("failed to create pkey struct from rsa keypair"))?;
+
+    // make a new x509 certificate with the pkey we generated
+    let mut x509builder = X509::builder()
+        .map_err(wrap_error!("failed to make x509 builder"))?;
+    x509builder.set_version(2)
+        .map_err(wrap_error!("failed to set x509 version"))?;
+
+    // set the serial number to some big random positive integer
+    let mut serial = bn::BigNum::new()
+        .map_err(wrap_error!("failed to make new bignum"))?;
+    serial.rand(32, bn::MSB_ONE, false)
+        .map_err(wrap_error!("failed to generate random bignum"))?;
+    let serial = serial.to_asn1_integer()
+        .map_err(wrap_error!("failed to get asn1 integer from bignum"))?;
+    x509builder.set_serial_number(&serial)
+        .map_err(wrap_error!("failed to set x509 serial number"))?;
+
+    // call fails without expiration dates
+    // I guess they are important anyway, but still
+    x509builder.set_not_before(&Asn1Time::days_from_now(0).unwrap())
+        .map_err(wrap_error!("failed to set x509 start date"))?;
+    x509builder.set_not_after(&Asn1Time::days_from_now(config.expire_in_days).unwrap())
+        .map_err(wrap_error!("failed to set x509 expiration date"))?;
+
+    // add the issuer and subject name
+    // it's set to "/CN=LinuxTransport"
+    // if we want we can make that configurable later
+    let mut x509namebuilder = X509Name::builder()
+        .map_err(wrap_error!("failed to get x509name builder"))?;
+    x509namebuilder.append_entry_by_text("CN", "LinuxTransport")
+        .map_err(wrap_error!("failed to append /CN=LinuxTransport to x509name builder"))?;
+    let x509name = x509namebuilder.build();
+    x509builder.set_issuer_name(&x509name)
+        .map_err(wrap_error!("failed to set x509 issuer name"))?;
+    x509builder.set_subject_name(&x509name)
+        .map_err(wrap_error!("failed to set x509 subject name"))?;
+
+    // set the public key
+    x509builder.set_pubkey(&pkey)
+        .map_err(wrap_error!("failed to set x509 pubkey"))?;
+
+    // it also needs several extensions
+    // in the openssl configuration file, these are set when generating certs
+    //     basicConstraints=CA:true
+    //     subjectKeyIdentifier=hash
+    //     authorityKeyIdentifier=keyid:always,issuer
+    // that means these extensions get added to certs generated using the
+    // command line tool automatically. but since we are constructing it, we
+    // need to add them manually.
+    // we need to do them one at a time, and they need to be in this order
+    let conf = Conf::new(ConfMethod::default())
+        .map_err(wrap_error!("failed to make new conf struct"))?;
+    // it seems like everything depends on the basic constraints, so let's do
+    // that first.
+    let bc = extension::BasicConstraints::new()
+        .ca()
+        .build()
+        .map_err(wrap_error!("failed to build BasicConstraints extension"))?;
+    x509builder.append_extension(bc)
+        .map_err(wrap_error!("failed to append BasicConstraints extension"))?;
+
+    // the akid depends on the skid. I guess it copies the skid when the cert is
+    // self-signed or something, I'm not really sure.
+    let skid = {
+        // we need to wrap these in a block because the builder gets borrowed away
+        // from us
+        let ext_con = x509builder.x509v3_context(None, Some(&conf));
+        extension::SubjectKeyIdentifier::new()
+            .build(&ext_con)
+            .map_err(wrap_error!("failed to build SubjectKeyIdentifier extention"))?
+    };
+    x509builder.append_extension(skid)
+        .map_err(wrap_error!("failed to append SubjectKeyIdentifier extention"))?;
+
+    // now that the skid is added we can add the akid
+    let akid = {
+        let ext_con = x509builder.x509v3_context(None, Some(&conf));
+        extension::AuthorityKeyIdentifier::new()
+            .keyid(true)
+            .issuer(false)
+            .build(&ext_con)
+            .map_err(wrap_error!("failed to build AuthorityKeyIdentifier extention"))?
+    };
+    x509builder.append_extension(akid)
+        .map_err(wrap_error!("failed to append AuthorityKeyIdentifier extention"))?;
+
+    // self-sign the certificate
+    x509builder.sign(&pkey, MessageDigest::sha256())
+        .map_err(wrap_error!("failed to self-sign x509 cert"))?;
+
+    let x509 = x509builder.build();
+
+    Ok((x509, pkey))
+}
diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
new file mode 100644
index 00000000..86a4e5f0
--- /dev/null
+++ b/src/providers/azure/mod.rs
@@ -0,0 +1,193 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod crypto;
+
+use self::crypto::x509;
+
+use metadata::Metadata;
+
+use hyper::client::Client;
+use hyper::header;
+use hyper::mime;
+
+use serde_xml_rs::deserialize;
+
+use std::net::{IpAddr, Ipv4Addr};
+use std::io::Read;
+
+header! {(MSAgentName, "x-ms-agent-name") => [String]}
+header! {(MSVersion, "x-ms-version") => [String]}
+header! {(MSCipherName, "x-ms-cipher-name") => [String]}
+header! {(MSCert, "x-ms-guest-agent-public-x509-cert") => [String]}
+
+const MS_AGENT_NAME: &str = "com.coreos.metadata";
+const MS_VERSION: &str = "2012-11-30";
+const SMIME_HEADER: &str = "\
+MIME-Version:1.0
+Content-Disposition: attachment; filename=/home/core/encrypted-ssh-cert.pem
+Content-Type: application/x-pkcs7-mime; name=/home/core/encrypted-ssh-cert.pem
+Content-Transfer-Encoding: base64
+
+";
+
+#[derive(Debug, Deserialize)]
+struct GoalState {
+    #[serde(rename = "Container")]
+    pub container: Container
+}
+
+#[derive(Debug, Deserialize)]
+struct Container {
+    #[serde(rename = "RoleInstanceList")]
+    pub role_instance_list: RoleInstanceList
+}
+
+#[derive(Debug, Deserialize)]
+struct RoleInstanceList {
+    #[serde(rename = "RoleInstance")]
+    pub role_instances: Vec<RoleInstance>
+}
+
+#[derive(Debug, Deserialize)]
+struct RoleInstance {
+    #[serde(rename = "Configuration")]
+    pub configuration: Configuration
+}
+
+#[derive(Debug, Deserialize)]
+struct Configuration {
+    #[serde(rename = "Certificates", default)]
+    pub certificates: String
+}
+
+#[derive(Debug, Deserialize)]
+struct CertificatesFile {
+    #[serde(rename = "Data", default)]
+    pub data: String
+}
+
+struct Azure {
+    client: Client,
+}
+
+impl Azure {
+    fn new() -> Self {
+        Azure {
+            client: Client::new(),
+        }
+    }
+
+    //TODO(sdemos): get the actual fabric address, instead of hardcoding it
+    fn get_fabric_address(&self) -> Result<IpAddr, String> {
+        Ok(IpAddr::V4(Ipv4Addr::new(168, 63, 129, 16)))
+    }
+
+    fn get_certs_endpoint(&self) -> Result<String, String> {
+        // get the address that we need to call to get the goalstate
+        let addr = self.get_fabric_address()
+            .map_err(wrap_error!("failed to get fabric address"))?;
+
+        // make the request to the goalstate endpoint
+        let mut res = self.client.get(&format!("http://{}/machine/?comp=goalstate", addr))
+            .header(MSAgentName(MS_AGENT_NAME.to_owned()))
+            .header(MSVersion(MS_VERSION.to_owned()))
+            .header(header::ContentType(mime::Mime(mime::TopLevel::Text, mime::SubLevel::Xml, vec![(mime::Attr::Charset, mime::Value::Utf8)])))
+            .send()
+            .map_err(wrap_error!("failed to request goal state"))?;
+
+        // read the goalstate body
+        let mut body = String::new();
+        res.read_to_string(&mut body)
+            .map_err(wrap_error!("failed to read goal state response body"))?;
+
+        // then deserialize the response into xml
+        let goalstate: GoalState = deserialize(body.as_bytes())
+            .map_err(wrap_error!("failed to deserialize xml into goalstate struct"))?;
+
+        // grab the certificates endpoint from the xml and return it
+        let cert_endpoint: &str = &goalstate.container.role_instance_list.role_instances[0].configuration.certificates;
+        Ok(String::from(cert_endpoint))
+    }
+
+    fn get_certs(&self, endpoint: String, mangled_pem: String) -> Result<String, String> {
+        // we need to make the request to the endpoint we got earlier to get the
+        // certificates file.
+        let mut res = self.client.get(&endpoint)
+            .header(MSAgentName(MS_AGENT_NAME.to_owned()))
+            .header(MSVersion(MS_VERSION.to_owned()))
+            .header(header::ContentType(mime::Mime(mime::TopLevel::Text, mime::SubLevel::Xml, vec![(mime::Attr::Charset, mime::Value::Utf8)])))
+            .header(MSCipherName("DES_EDE3_CBC".to_owned()))
+            .header(MSCert(mangled_pem))
+            .send()
+            .map_err(wrap_error!("failed to fetch certificates"))?;
+
+        let mut body = String::new();
+        res.read_to_string(&mut body)
+            .map_err(wrap_error!("failed to read certificates file from response body"))?;
+
+        // deserialize that too.
+        let certs: CertificatesFile = deserialize(body.as_bytes())
+            .map_err(wrap_error!("failed to deserialize xml into CertificatesFile struct"))?;
+
+        // the cms decryption expects it to have MIME information on the top
+        // since cms is really for email attachments...don't tell the cops.
+        let mut smime = String::from(SMIME_HEADER);
+        smime.push_str(&certs.data);
+
+        Ok(smime)
+    }
+
+    // put it all together
+    fn get_ssh_pubkey(&self) -> Result<String, String> {
+        // first we have to get the certificates endoint.
+        let certs_endpoint = self.get_certs_endpoint()
+            .map_err(wrap_error!("failed to get certs endpoint"))?;
+
+        // we have to generate the rsa public/private keypair and the x509 cert
+        // that we use to make the request. this is equivalent to
+        // `openssl req -x509 -nodes -subj /CN=LinuxTransport -days 365 -newkey rsa:2048 -keyout private.pem -out cert.pem`
+        let (x509, pkey) = x509::generate_cert(x509::Config::new(2048, 365))
+            .map_err(wrap_error!("failed to generate keys"))?;
+
+        // mangle the pem file for the request
+        let mangled_pem = crypto::mangle_pem(&x509)
+            .map_err(wrap_error!("failed to mangle pem"))?;
+
+        // fetch the encrypted cms blob from the certs endpoint
+        let smime = self.get_certs(certs_endpoint, mangled_pem)
+            .map_err(wrap_error!("failed to get certs"))?;
+
+        // decrypt the cms blob
+        let p12 = crypto::decrypt_cms(smime.as_bytes(), &pkey, &x509)
+            .map_err(wrap_error!("failed to decrypt cms blob"))?;
+
+        // convert that to the OpenSSH public key format
+        let ssh_pubkey = crypto::p12_to_ssh_pubkey(&p12)
+            .map_err(wrap_error!("failed to convert pkcs12 blob to ssh pubkey"))?;
+
+        Ok(ssh_pubkey)
+    }
+}
+
+pub fn fetch_metadata() -> Result<Metadata, String> {
+    let provider = Azure::new();
+
+    let ssh_pubkey = provider.get_ssh_pubkey()
+        .map_err(wrap_error!("azure: failed to get ssh pubkey"))?;
+
+    Ok(Metadata::builder()
+       .add_ssh_key(ssh_pubkey)
+       .build())
+}
diff --git a/src/providers/mod.rs b/src/providers/mod.rs
new file mode 100644
index 00000000..fa24a2ca
--- /dev/null
+++ b/src/providers/mod.rs
@@ -0,0 +1,26 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Providers
+//!
+//! These are the providers which coreos-metadata knows how to retrieve metadata
+//! from. Internally, they handle the ins and outs of each providers metadata
+//! services, and externally, they provide a function to fetch that metadata in
+//! a regular format.
+//!
+//! To add a provider, put a `pub mod provider;` line in this file, export a
+//! function to fetch the metadata, and then add a match line in the top-level
+//! `fetch_metadata()` function in metadata.rs.
+
+pub mod azure;

From b89641024c2364dcf29b1d5935af3ad97b4c9d09 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Mon, 14 Aug 2017 12:48:25 -0700
Subject: [PATCH 16/71] bin: fixed top-level logging output

this fixed some copy-pasta
---
 src/bin/coreos-metadata.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/coreos-metadata.rs b/src/bin/coreos-metadata.rs
index b9e67e4e..4e710bff 100644
--- a/src/bin/coreos-metadata.rs
+++ b/src/bin/coreos-metadata.rs
@@ -72,17 +72,17 @@ fn main() {
     // write ssh keys if configured to do so
     config.ssh_keys_user
         .map_or(Ok(()), |x| metadata.write_ssh_keys(x))
-        .unwrap_or_else(log_and_die!("writing metadata attributes"));
+        .unwrap_or_else(log_and_die!("writing ssh keys"));
 
     // write hostname if configured to do so
     config.hostname_file
         .map_or(Ok(()), |x| metadata.write_hostname(x))
-        .unwrap_or_else(log_and_die!("writing metadata attributes"));
+        .unwrap_or_else(log_and_die!("writing hostname"));
 
     // write network units if configured to do so
     config.network_units_dir
         .map_or(Ok(()), |x| metadata.write_network_units(x))
-        .unwrap_or_else(log_and_die!("writing metadata attributes"));
+        .unwrap_or_else(log_and_die!("writing network units"));
 
     debug!("Done!")
 }

From b9f2d3106de9414b774a2b7d9d4e45f0445329b5 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Mon, 14 Aug 2017 13:01:06 -0700
Subject: [PATCH 17/71] providers: added provider scaffolding

this adds all the providers that we eventually need to implement at the
time of this writing. none of the implementations, just the modules.
---
 src/lib.rs                              |  6 ++++++
 src/providers/azure/mod.rs              |  2 ++
 src/providers/digitalocean/mod.rs       | 21 +++++++++++++++++++++
 src/providers/ec2/mod.rs                | 21 +++++++++++++++++++++
 src/providers/gce/mod.rs                | 21 +++++++++++++++++++++
 src/providers/mod.rs                    |  6 ++++++
 src/providers/openstack/mod.rs          | 21 +++++++++++++++++++++
 src/providers/packet/mod.rs             | 21 +++++++++++++++++++++
 src/providers/vagrant_virtualbox/mod.rs | 21 +++++++++++++++++++++
 9 files changed, 140 insertions(+)
 create mode 100644 src/providers/digitalocean/mod.rs
 create mode 100644 src/providers/ec2/mod.rs
 create mode 100644 src/providers/gce/mod.rs
 create mode 100644 src/providers/openstack/mod.rs
 create mode 100644 src/providers/packet/mod.rs
 create mode 100644 src/providers/vagrant_virtualbox/mod.rs

diff --git a/src/lib.rs b/src/lib.rs
index 9f485b79..c30fd0ee 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,6 +40,12 @@ use metadata::Metadata;
 pub fn fetch_metadata(provider: &str) -> Result<Metadata, String> {
     match provider {
         "azure" => azure::fetch_metadata(),
+        "digitalocean" => digitalocean::fetch_metadata(),
+        "ec2" => ec2::fetch_metadata(),
+        "gce" => gce::fetch_metadata(),
+        "openstack" => openstack::fetch_metadata(),
+        "packet" => packet::fetch_metadata(),
+        "vagrant_virtualbox" => vagrant_virtualbox::fetch_metadata(),
         _ => Err(format!("unknown provider '{}'", provider)),
     }
 }
diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index 86a4e5f0..1e1a6654 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//! azure metadata fetcher
+
 mod crypto;
 
 use self::crypto::x509;
diff --git a/src/providers/digitalocean/mod.rs b/src/providers/digitalocean/mod.rs
new file mode 100644
index 00000000..3d99c838
--- /dev/null
+++ b/src/providers/digitalocean/mod.rs
@@ -0,0 +1,21 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! digital ocean metadata fetcher
+
+use metadata::Metadata;
+
+pub fn fetch_metadata() -> Result<Metadata, String> {
+    unimplemented!();
+}
diff --git a/src/providers/ec2/mod.rs b/src/providers/ec2/mod.rs
new file mode 100644
index 00000000..ac6caaf8
--- /dev/null
+++ b/src/providers/ec2/mod.rs
@@ -0,0 +1,21 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! aws ec2 metadata fetcher
+
+use metadata::Metadata;
+
+pub fn fetch_metadata() -> Result<Metadata, String> {
+    unimplemented!();
+}
diff --git a/src/providers/gce/mod.rs b/src/providers/gce/mod.rs
new file mode 100644
index 00000000..df9f038e
--- /dev/null
+++ b/src/providers/gce/mod.rs
@@ -0,0 +1,21 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! google compute engine metadata fetcher
+
+use metadata::Metadata;
+
+pub fn fetch_metadata() -> Result<Metadata, String> {
+    unimplemented!();
+}
diff --git a/src/providers/mod.rs b/src/providers/mod.rs
index fa24a2ca..642a7d1f 100644
--- a/src/providers/mod.rs
+++ b/src/providers/mod.rs
@@ -24,3 +24,9 @@
 //! `fetch_metadata()` function in metadata.rs.
 
 pub mod azure;
+pub mod digitalocean;
+pub mod ec2;
+pub mod gce;
+pub mod openstack;
+pub mod packet;
+pub mod vagrant_virtualbox;
diff --git a/src/providers/openstack/mod.rs b/src/providers/openstack/mod.rs
new file mode 100644
index 00000000..b40ee02e
--- /dev/null
+++ b/src/providers/openstack/mod.rs
@@ -0,0 +1,21 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! openstack metadata fetcher
+
+use metadata::Metadata;
+
+pub fn fetch_metadata() -> Result<Metadata, String> {
+    unimplemented!();
+}
diff --git a/src/providers/packet/mod.rs b/src/providers/packet/mod.rs
new file mode 100644
index 00000000..4b23933f
--- /dev/null
+++ b/src/providers/packet/mod.rs
@@ -0,0 +1,21 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! packet metadata fetcher
+
+use metadata::Metadata;
+
+pub fn fetch_metadata() -> Result<Metadata, String> {
+    unimplemented!();
+}
diff --git a/src/providers/vagrant_virtualbox/mod.rs b/src/providers/vagrant_virtualbox/mod.rs
new file mode 100644
index 00000000..127a9a64
--- /dev/null
+++ b/src/providers/vagrant_virtualbox/mod.rs
@@ -0,0 +1,21 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! vagrant/virtualbox metadata fetcher
+
+use metadata::Metadata;
+
+pub fn fetch_metadata() -> Result<Metadata, String> {
+    unimplemented!();
+}

From f06ee9158bd3ca59b184888c2bb3397b1925ddb3 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 15 Aug 2017 10:45:23 -0700
Subject: [PATCH 18/71] azure: get metadata service from fabric address

this adds functionality for reading the OPTION_245 flag from the dhcp
lease so that we are definitely talking to the right azure metadata
service instead of a hard-coded one.
---
 Cargo.lock                 | 166 +++++++++++++++++++++++++++++++++++++
 Cargo.toml                 |   1 +
 src/lib.rs                 |   7 ++
 src/providers/azure/mod.rs |  47 ++++++++++-
 4 files changed, 218 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 20934519..5978a2b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,6 +8,7 @@ dependencies = [
  "hyper 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.9.15",
+ "pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-xml-rs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -18,6 +19,14 @@ dependencies = [
  "users 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "ansi_term"
 version = "0.9.0"
@@ -50,6 +59,11 @@ dependencies = [
  "safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "bitflags"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bitflags"
 version = "0.7.0"
@@ -105,6 +119,11 @@ name = "gcc"
 version = "0.3.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "glob"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "httparse"
 version = "1.2.3"
@@ -138,6 +157,11 @@ dependencies = [
  "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "ipnetwork"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "isatty"
 version = "0.1.3"
@@ -182,6 +206,14 @@ name = "matches"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "memchr"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "mime"
 version = "0.2.6"
@@ -268,6 +300,36 @@ name = "pkg-config"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "pnet"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pnet_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pnet_macros_support 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pnet_macros"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_syntax 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pnet_macros_support"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "quote"
 version = "0.3.15"
@@ -278,6 +340,28 @@ name = "redox_syscall"
 version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "regex"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rustc-serialize"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "rustc_version"
 version = "0.1.7"
@@ -390,6 +474,51 @@ dependencies = [
  "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "syntex"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_syntax 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "syntex_errors"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "syntex_pos"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "syntex_syntax"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "take_mut"
 version = "0.1.3"
@@ -492,6 +621,11 @@ name = "unicode-width"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "unicode-xid"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicode-xid"
 version = "0.0.4"
@@ -523,6 +657,11 @@ dependencies = [
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "utf8-ranges"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "vec_map"
 version = "0.8.0"
@@ -548,6 +687,15 @@ name = "winapi-build"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ws2_32-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "xml-rs"
 version = "0.3.6"
@@ -557,10 +705,12 @@ dependencies = [
 ]
 
 [metadata]
+"checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
 "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
 "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
 "checksum base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30e93c03064e7590d0466209155251b90c22e37fab1daf2771582598b5827557"
 "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
+"checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
 "checksum byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d"
@@ -569,9 +719,11 @@ dependencies = [
 "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
 "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
 "checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a"
+"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
 "checksum hyper 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)" = "0f01e4a20f5dfa5278d7762b7bdb7cab96e24378b9eca3889fbd4b5e94dc7063"
 "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
+"checksum ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)" = "232e76922883005380e831068f731ef0305541c9f77b30df3a1635047b16f370"
 "checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
@@ -579,6 +731,7 @@ dependencies = [
 "checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503"
 "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
 "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
+"checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
 "checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
 "checksum mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "153f98dde2b135dece079e5478ee400ae1bab13afa52d66590eacfc40e912435"
 "checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525"
@@ -588,8 +741,14 @@ dependencies = [
 "checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584"
 "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356"
 "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
+"checksum pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d0364bc9319e77afb74fa65f6c8b0d73b1d3208f289cd227678f10562730791"
+"checksum pnet_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e77669156bd4cb7732fc11261a33cc56705100e3bed019ee1cbd84d97e2d9909"
+"checksum pnet_macros_support 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c79f254137dcce415bdf2c10b40cf74009a7a8d4a17985cc7773b41f7ccfaf1"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum redox_syscall 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "9df6a71a1e67be2104410736b2389fb8e383c1d7e9e792d629ff13c02867147a"
+"checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
+"checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
+"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
 "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
 "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
@@ -604,6 +763,10 @@ dependencies = [
 "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
+"checksum syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0a30b08a6b383a22e5f6edc127d169670d48f905bb00ca79a00ea3e442ebe317"
+"checksum syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646"
+"checksum syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd49988e52451813c61fecbe9abb5cfd4e1b7bb6cdbb980a6fbcbab859171a6"
+"checksum syntex_syntax 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7628a0506e8f9666fdabb5f265d0059b059edac9a3f810bda077abb5d826bd8d"
 "checksum take_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7986ceb18a0d75e1fcb8b27c0119389bbe05f016e5a6e54d003251acc1122108"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
@@ -618,13 +781,16 @@ dependencies = [
 "checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
 "checksum unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18127285758f0e2c6cf325bb3f3d138a12fee27de4f23e146cd6a179f26c2cf3"
 "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
+"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
 "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27"
 "checksum users 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7ae8fdf783cb9652109c99886459648feb92ecc749e6b8e7930f6decba74c7c"
+"checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
 "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
 "checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562"
diff --git a/Cargo.toml b/Cargo.toml
index 82f3b23e..40d74a51 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,6 +21,7 @@ serde-xml-rs = "0.2"
 openssl = { path = "/home/demos/projects/rust-openssl/openssl" }
 base64 = "0.6"
 byteorder = "1.1"
+pnet = "0.19"
 
 [dependencies.slog]
 version = "*"
diff --git a/src/lib.rs b/src/lib.rs
index c30fd0ee..f471f674 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,11 +15,18 @@
 #[macro_use]
 extern crate hyper;
 
+#[macro_use]
+extern crate slog;
+#[macro_use]
+extern crate slog_scope;
+
 #[macro_use]
 extern crate serde_derive;
 extern crate serde;
 extern crate serde_xml_rs;
 
+extern crate pnet;
+
 extern crate openssl;
 
 extern crate users;
diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index 1e1a6654..1fe853d1 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -24,16 +24,21 @@ use hyper::client::Client;
 use hyper::header;
 use hyper::mime;
 
+use pnet;
+
 use serde_xml_rs::deserialize;
 
 use std::net::{IpAddr, Ipv4Addr};
-use std::io::Read;
+use std::fs::File;
+use std::path::Path;
+use std::io::{BufRead, BufReader, Read};
 
 header! {(MSAgentName, "x-ms-agent-name") => [String]}
 header! {(MSVersion, "x-ms-version") => [String]}
 header! {(MSCipherName, "x-ms-cipher-name") => [String]}
 header! {(MSCert, "x-ms-guest-agent-public-x509-cert") => [String]}
 
+const OPTION_245: &str = "OPTION_245";
 const MS_AGENT_NAME: &str = "com.coreos.metadata";
 const MS_VERSION: &str = "2012-11-30";
 const SMIME_HEADER: &str = "\
@@ -91,9 +96,45 @@ impl Azure {
         }
     }
 
-    //TODO(sdemos): get the actual fabric address, instead of hardcoding it
+    // I don't really understand why this is how we need to get this ip
+    // address but this is how it works in the original implementation
+    // and nobody complains about it, so w/e
     fn get_fabric_address(&self) -> Result<IpAddr, String> {
-        Ok(IpAddr::V4(Ipv4Addr::new(168, 63, 129, 16)))
+        // get the interfaces on the machine
+        let interfaces = pnet::datalink::interfaces();
+        trace!("interfaces - {:?}", interfaces);
+
+        for interface in interfaces {
+            trace!("looking at interface {:?}", interface);
+            let lease_path = format!("/run/systemd/netif/leases/{}", interface.index);
+            let lease_path = Path::new(&lease_path);
+            if lease_path.exists() {
+                debug!("found lease file - {:?}", lease_path);
+                let lease = File::open(&lease_path)
+                    .map_err(wrap_error!("failed to open lease file ({:?})", lease_path))?;
+                let lease = BufReader::new(&lease);
+
+                // find the OPTION_245 flag
+                for line in lease.lines() {
+                    let line = line
+                        .map_err(wrap_error!("failed to read from lease file ({:?})", lease_path))?;
+                    let option: Vec<&str> = line.split('=').collect();
+                    if option.len() > 1 && option[0] == OPTION_245 {
+                        // value is an 8 digit hex value. convert it to u32 and
+                        // then parse that into an ip. Ipv4Addr::from(u32)
+                        // performs conversion from big-endian
+                        trace!("found fabric address in hex - {:?}", option[1]);
+                        let dec = u32::from_str_radix(option[1], 16)
+                            .map_err(wrap_error!("failed to convert '{}' from hex", option[1]))?;
+                        return Ok(IpAddr::V4(Ipv4Addr::from(dec)));
+                    }
+                }
+
+                debug!("failed to get fabric address from existing lease file '{:?}'", lease_path);
+            }
+        }
+
+        Err(format!("failed to retrieve fabric address"))
     }
 
     fn get_certs_endpoint(&self) -> Result<String, String> {

From f2451e4607ebdcb67b9f3c3ed22ddd6d533e86db Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 15 Aug 2017 10:51:43 -0700
Subject: [PATCH 19/71] cargo: update to latest rust-openssl bindings

for a little while, we were using a for of this package with some
additional functionality. that functionality has now been merged
upstream in sfackler/rust-openssl#675 and we can now just point at the
released package.
---
 Cargo.lock | 19 +++++++++++++++----
 Cargo.toml |  4 +---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5978a2b6..9ff481c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,7 +7,7 @@ dependencies = [
  "clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.9.15",
+ "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-xml-rs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -272,22 +272,25 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.9.15"
+version = "0.9.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.15",
+ "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.15"
+version = "0.9.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -662,6 +665,11 @@ name = "utf8-ranges"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "vcpkg"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "vec_map"
 version = "0.8.0"
@@ -739,6 +747,8 @@ dependencies = [
 "checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
 "checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0"
 "checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584"
+"checksum openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "085aaedcc89a2fac1eb2bc19cd66f29d4ea99fec60f82a5f3a88a6be7dbd90b5"
+"checksum openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7e3a9845a4c9fdb321931868aae5549e96bb7b979bf9af7de03603d74691b5f3"
 "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356"
 "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
 "checksum pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d0364bc9319e77afb74fa65f6c8b0d73b1d3208f289cd227678f10562730791"
@@ -787,6 +797,7 @@ dependencies = [
 "checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27"
 "checksum users 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7ae8fdf783cb9652109c99886459648feb92ecc749e6b8e7930f6decba74c7c"
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
+"checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b"
 "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
 "checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
diff --git a/Cargo.toml b/Cargo.toml
index 40d74a51..b3099de1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,9 +16,7 @@ mime = "0.3"
 serde = "1.0"
 serde_derive = "1.0"
 serde-xml-rs = "0.2"
-# use my fork of openssl until my changes are released
-# they are merged into master, just waiting on a tag
-openssl = { path = "/home/demos/projects/rust-openssl/openssl" }
+openssl = "0.9.17"
 base64 = "0.6"
 byteorder = "1.1"
 pnet = "0.19"

From 7e1935d8ce969d3f55b45be3fd769ef6fea4999c Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 15 Aug 2017 13:30:31 -0700
Subject: [PATCH 20/71] azure: validate fabric version

we need to make sure that the fabric address that we got actually points
to a metadata service, and that that service is compatible with us.
---
 src/providers/azure/mod.rs | 58 +++++++++++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index 1fe853d1..0cf483f3 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -85,21 +85,40 @@ struct CertificatesFile {
     pub data: String
 }
 
+#[derive(Debug, Deserialize)]
+struct Versions {
+    #[serde(rename = "Supported")]
+    pub supported: Supported
+}
+
+#[derive(Debug, Deserialize)]
+struct Supported {
+    #[serde(rename = "Version", default)]
+    pub versions: Vec<String>
+}
+
 struct Azure {
     client: Client,
+    endpoint: IpAddr,
 }
 
 impl Azure {
-    fn new() -> Self {
-        Azure {
+    fn new() -> Result<Self, String> {
+        let addr = Azure::get_fabric_address()
+            .map_err(wrap_error!("failed to get fabric address"))?;
+        let azure = Azure {
             client: Client::new(),
-        }
+            endpoint: addr,
+        };
+        azure.is_fabric_compatible(MS_VERSION)
+            .map_err(wrap_error!("failed version compatibility check"))?;
+        Ok(azure)
     }
 
     // I don't really understand why this is how we need to get this ip
     // address but this is how it works in the original implementation
     // and nobody complains about it, so w/e
-    fn get_fabric_address(&self) -> Result<IpAddr, String> {
+    fn get_fabric_address() -> Result<IpAddr, String> {
         // get the interfaces on the machine
         let interfaces = pnet::datalink::interfaces();
         trace!("interfaces - {:?}", interfaces);
@@ -137,13 +156,31 @@ impl Azure {
         Err(format!("failed to retrieve fabric address"))
     }
 
-    fn get_certs_endpoint(&self) -> Result<String, String> {
-        // get the address that we need to call to get the goalstate
-        let addr = self.get_fabric_address()
-            .map_err(wrap_error!("failed to get fabric address"))?;
+    fn is_fabric_compatible(&self, version: &str) -> Result<(), String> {
+        let mut res = self.client.get(&format!("http://{}/?comp=versions", self.endpoint))
+            .header(MSAgentName(MS_AGENT_NAME.to_owned()))
+            .header(MSVersion(MS_VERSION.to_owned()))
+            .header(header::ContentType(mime::Mime(mime::TopLevel::Text, mime::SubLevel::Xml, vec![(mime::Attr::Charset, mime::Value::Utf8)])))
+            .send()
+            .map_err(wrap_error!("failed to request versions"))?;
+
+        let mut body = String::new();
+        res.read_to_string(&mut body)
+            .map_err(wrap_error!("failed to read versions response body"))?;
 
+        let versions: Versions = deserialize(body.as_bytes())
+            .map_err(wrap_error!("failed to deserialize xml into versions struct"))?;
+
+        if versions.supported.versions.iter().any(|v| v == version) {
+            Ok(())
+        } else {
+            Err(format!("fabric version {} not compatible with fabric address {}", MS_VERSION, self.endpoint))
+        }
+    }
+
+    fn get_certs_endpoint(&self) -> Result<String, String> {
         // make the request to the goalstate endpoint
-        let mut res = self.client.get(&format!("http://{}/machine/?comp=goalstate", addr))
+        let mut res = self.client.get(&format!("http://{}/machine/?comp=goalstate", self.endpoint))
             .header(MSAgentName(MS_AGENT_NAME.to_owned()))
             .header(MSVersion(MS_VERSION.to_owned()))
             .header(header::ContentType(mime::Mime(mime::TopLevel::Text, mime::SubLevel::Xml, vec![(mime::Attr::Charset, mime::Value::Utf8)])))
@@ -225,7 +262,8 @@ impl Azure {
 }
 
 pub fn fetch_metadata() -> Result<Metadata, String> {
-    let provider = Azure::new();
+    let provider = Azure::new()
+        .map_err(wrap_error!("azure: failed create metadata client"))?;
 
     let ssh_pubkey = provider.get_ssh_pubkey()
         .map_err(wrap_error!("azure: failed to get ssh pubkey"))?;

From cd6efaf052721d949639b77f0633388af1baf7de Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 15 Aug 2017 15:09:35 -0700
Subject: [PATCH 21/71] retry: added basic http get client logic

doesn't currently have retries, but it does cut down on repeated http
get code.
---
 src/lib.rs       |   1 +
 src/retry/mod.rs | 122 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+)
 create mode 100644 src/retry/mod.rs

diff --git a/src/lib.rs b/src/lib.rs
index f471f674..7cbab3f6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -37,6 +37,7 @@ mod providers;
 mod metadata;
 mod ssh;
 mod network;
+mod retry;
 
 use providers::*;
 use metadata::Metadata;
diff --git a/src/retry/mod.rs b/src/retry/mod.rs
new file mode 100644
index 00000000..84aad8a7
--- /dev/null
+++ b/src/retry/mod.rs
@@ -0,0 +1,122 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! retry
+//!
+//! this is an abstraction over the regular http get request. it allows you to
+//! have a request retry until it succeeds, with a configurable number of
+//! of attempts and a backoff strategy. It also takes care of automatically
+//! deserializing responses and handles headers in a sane way.
+
+use hyper;
+use hyper::header;
+
+use serde;
+use serde_xml_rs;
+
+use std::io::Read;
+use std::marker::Copy;
+
+#[derive(Debug)]
+pub struct Client<D>
+    where D: Deserializer
+{
+    headers: header::Headers,
+    deserializer: D,
+    client: hyper::client::Client,
+}
+
+pub trait Deserializer {
+    fn deserialize<'de, T>(&self, &str) -> Result<T, String>
+        where T: serde::Deserialize<'de>;
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct Xml;
+
+impl Deserializer for Xml {
+    fn deserialize<'de, T>(&self, input: &str) -> Result<T, String>
+        where T: serde::Deserialize<'de>
+    {
+        serde_xml_rs::deserialize(input.as_bytes())
+            .map_err(wrap_error!("failed xml deserialization"))
+    }
+}
+
+pub struct RequestBuilder<'a, D>
+    where D: Deserializer
+{
+    req: hyper::client::RequestBuilder<'a>,
+    deserializer: D,
+    uri: String,
+}
+
+impl<'a, D> RequestBuilder<'a, D>
+    where D: Deserializer
+{
+    pub fn header<H>(mut self, header: H) -> Self
+        where H: header::Header + header::HeaderFormat
+    {
+        self.req = self.req.header(header);
+        self
+    }
+
+    pub fn send<'de, T>(self) -> Result<T, String>
+        where T: serde::Deserialize<'de> + 'de
+    {
+        // save uri for logging
+        let uri = self.uri;
+
+        let mut res = self.req.send()
+            .map_err(wrap_error!("failed to request from uri '{}'", uri))?;
+
+        let mut body = String::new();
+        res.read_to_string(&mut body)
+            .map_err(wrap_error!("failed to read response body"))?;
+
+        trace!("http get response from '{}': {}", uri, body);
+
+        self.deserializer.deserialize(&body)
+            .map_err(wrap_error!("failed to deserialize xml into versions struct"))
+    }
+}
+
+impl<D> Client<D>
+    where D: Deserializer + Copy
+{
+    pub fn new(deserializer: D) -> Self {
+        Client {
+            deserializer: deserializer,
+            headers: header::Headers::new(),
+            client: hyper::client::Client::new(),
+        }
+    }
+
+    pub fn header<H>(mut self, header: H) -> Self
+        where H: header::Header + header::HeaderFormat
+    {
+        self.headers.set(header);
+        self
+    }
+
+    pub fn get(&self, uri: String) -> RequestBuilder<D> {
+        trace!("http get request to '{}' with headers '{:?}'", uri, self.headers);
+        let req = self.client.get(&uri).headers(self.headers.clone());
+        RequestBuilder {
+            req: req,
+            uri: uri,
+            deserializer: self.deserializer,
+        }
+    }
+}

From debb11fbcdd82ca495dc656161ac1ec860489b73 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 15 Aug 2017 15:47:39 -0700
Subject: [PATCH 22/71] azure: move to new retry client implementation

this commit actually moves the azure provider over to the new retry
module implementation
---
 src/providers/azure/mod.rs | 63 ++++++++++----------------------------
 src/retry/mod.rs           |  2 ++
 2 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index 0cf483f3..4d642089 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -20,18 +20,18 @@ use self::crypto::x509;
 
 use metadata::Metadata;
 
-use hyper::client::Client;
 use hyper::header;
 use hyper::mime;
 
 use pnet;
 
-use serde_xml_rs::deserialize;
+
+use retry;
 
 use std::net::{IpAddr, Ipv4Addr};
 use std::fs::File;
 use std::path::Path;
-use std::io::{BufRead, BufReader, Read};
+use std::io::{BufRead, BufReader};
 
 header! {(MSAgentName, "x-ms-agent-name") => [String]}
 header! {(MSVersion, "x-ms-version") => [String]}
@@ -98,7 +98,7 @@ struct Supported {
 }
 
 struct Azure {
-    client: Client,
+    client: retry::Client<retry::Xml>,
     endpoint: IpAddr,
 }
 
@@ -106,8 +106,12 @@ impl Azure {
     fn new() -> Result<Self, String> {
         let addr = Azure::get_fabric_address()
             .map_err(wrap_error!("failed to get fabric address"))?;
+        let client = retry::Client::new(retry::Xml)
+            .header(MSAgentName(MS_AGENT_NAME.to_owned()))
+            .header(MSVersion(MS_VERSION.to_owned()))
+            .header(header::ContentType(mime::Mime(mime::TopLevel::Text, mime::SubLevel::Xml, vec![(mime::Attr::Charset, mime::Value::Utf8)])));
         let azure = Azure {
-            client: Client::new(),
+            client: client,
             endpoint: addr,
         };
         azure.is_fabric_compatible(MS_VERSION)
@@ -157,19 +161,9 @@ impl Azure {
     }
 
     fn is_fabric_compatible(&self, version: &str) -> Result<(), String> {
-        let mut res = self.client.get(&format!("http://{}/?comp=versions", self.endpoint))
-            .header(MSAgentName(MS_AGENT_NAME.to_owned()))
-            .header(MSVersion(MS_VERSION.to_owned()))
-            .header(header::ContentType(mime::Mime(mime::TopLevel::Text, mime::SubLevel::Xml, vec![(mime::Attr::Charset, mime::Value::Utf8)])))
+        let versions: Versions = self.client.get(format!("http://{}/?comp=versions", self.endpoint))
             .send()
-            .map_err(wrap_error!("failed to request versions"))?;
-
-        let mut body = String::new();
-        res.read_to_string(&mut body)
-            .map_err(wrap_error!("failed to read versions response body"))?;
-
-        let versions: Versions = deserialize(body.as_bytes())
-            .map_err(wrap_error!("failed to deserialize xml into versions struct"))?;
+            .map_err(wrap_error!("failed to get versions"))?;
 
         if versions.supported.versions.iter().any(|v| v == version) {
             Ok(())
@@ -179,22 +173,9 @@ impl Azure {
     }
 
     fn get_certs_endpoint(&self) -> Result<String, String> {
-        // make the request to the goalstate endpoint
-        let mut res = self.client.get(&format!("http://{}/machine/?comp=goalstate", self.endpoint))
-            .header(MSAgentName(MS_AGENT_NAME.to_owned()))
-            .header(MSVersion(MS_VERSION.to_owned()))
-            .header(header::ContentType(mime::Mime(mime::TopLevel::Text, mime::SubLevel::Xml, vec![(mime::Attr::Charset, mime::Value::Utf8)])))
+        let goalstate: GoalState = self.client.get(format!("http://{}/machine/?comp=goalstate", self.endpoint))
             .send()
-            .map_err(wrap_error!("failed to request goal state"))?;
-
-        // read the goalstate body
-        let mut body = String::new();
-        res.read_to_string(&mut body)
-            .map_err(wrap_error!("failed to read goal state response body"))?;
-
-        // then deserialize the response into xml
-        let goalstate: GoalState = deserialize(body.as_bytes())
-            .map_err(wrap_error!("failed to deserialize xml into goalstate struct"))?;
+            .map_err(wrap_error!("failed to get goal state"))?;
 
         // grab the certificates endpoint from the xml and return it
         let cert_endpoint: &str = &goalstate.container.role_instance_list.role_instances[0].configuration.certificates;
@@ -202,24 +183,12 @@ impl Azure {
     }
 
     fn get_certs(&self, endpoint: String, mangled_pem: String) -> Result<String, String> {
-        // we need to make the request to the endpoint we got earlier to get the
-        // certificates file.
-        let mut res = self.client.get(&endpoint)
-            .header(MSAgentName(MS_AGENT_NAME.to_owned()))
-            .header(MSVersion(MS_VERSION.to_owned()))
-            .header(header::ContentType(mime::Mime(mime::TopLevel::Text, mime::SubLevel::Xml, vec![(mime::Attr::Charset, mime::Value::Utf8)])))
+        // get the certificates
+        let certs: CertificatesFile = self.client.get(endpoint)
             .header(MSCipherName("DES_EDE3_CBC".to_owned()))
             .header(MSCert(mangled_pem))
             .send()
-            .map_err(wrap_error!("failed to fetch certificates"))?;
-
-        let mut body = String::new();
-        res.read_to_string(&mut body)
-            .map_err(wrap_error!("failed to read certificates file from response body"))?;
-
-        // deserialize that too.
-        let certs: CertificatesFile = deserialize(body.as_bytes())
-            .map_err(wrap_error!("failed to deserialize xml into CertificatesFile struct"))?;
+            .map_err(wrap_error!("failed to get certificates"))?;
 
         // the cms decryption expects it to have MIME information on the top
         // since cms is really for email attachments...don't tell the cops.
diff --git a/src/retry/mod.rs b/src/retry/mod.rs
index 84aad8a7..bbd76658 100644
--- a/src/retry/mod.rs
+++ b/src/retry/mod.rs
@@ -68,6 +68,7 @@ impl<'a, D> RequestBuilder<'a, D>
     pub fn header<H>(mut self, header: H) -> Self
         where H: header::Header + header::HeaderFormat
     {
+        trace!("http request to '{}': adding header: {:?}", self.uri, header);
         self.req = self.req.header(header);
         self
     }
@@ -112,6 +113,7 @@ impl<D> Client<D>
 
     pub fn get(&self, uri: String) -> RequestBuilder<D> {
         trace!("http get request to '{}' with headers '{:?}'", uri, self.headers);
+
         let req = self.client.get(&uri).headers(self.headers.clone());
         RequestBuilder {
             req: req,

From 3f6a99368d6ce7a4278bbe7b1fa2a231be79eb52 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 16 Aug 2017 16:25:13 -0700
Subject: [PATCH 23/71] retry: add retry logic

Replaces hyper dependency with reqwest, rewrites src/retry/mod.rs to use
reqwest and implement http backoff and retry logic, and refactors
src/providers/azure/mod.rs to use the new retry logic.
---
 Cargo.lock                 | 463 +++++++++++++++++++++++++++++++++----
 Cargo.toml                 |   5 +-
 src/lib.rs                 |   1 +
 src/providers/azure/mod.rs |  19 +-
 src/retry/mod.rs           | 224 +++++++++++++-----
 5 files changed, 598 insertions(+), 114 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9ff481c7..0ee7eb8d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,10 +5,11 @@ dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-xml-rs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -19,6 +20,20 @@ dependencies = [
  "users 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "adler32"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "advapi32-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "0.6.3"
@@ -42,14 +57,6 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "base64"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "base64"
 version = "0.6.0"
@@ -79,6 +86,20 @@ name = "byteorder"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "bytes"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cfg-if"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "chrono"
 version = "0.4.0"
@@ -104,16 +125,74 @@ dependencies = [
  "vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "conv"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "crossbeam"
 version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "crypt32-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "custom_derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "dtoa"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "foreign-types"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "futures"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-cpupool"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "gcc"
 version = "0.3.51"
@@ -131,20 +210,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "hyper"
-version = "0.10.12"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
- "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tls 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -157,6 +254,15 @@ dependencies = [
  "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "iovec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "ipnetwork"
 version = "0.12.6"
@@ -172,6 +278,11 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "itoa"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -191,16 +302,47 @@ name = "lazy_static"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "lazycell"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "libc"
 version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "libflate"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "adler32 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "log"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "magenta"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "magenta-sys"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.6"
@@ -216,18 +358,63 @@ dependencies = [
 
 [[package]]
 name = "mime"
-version = "0.2.6"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "mio"
+version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "mime"
-version = "0.3.3"
+name = "miow"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "schannel 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "net2"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -338,6 +525,15 @@ name = "quote"
 version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "rand"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.1.26"
@@ -360,6 +556,27 @@ name = "regex-syntax"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "reqwest"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tls 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustc-serialize"
 version = "0.3.24"
@@ -378,6 +595,54 @@ name = "safemem"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "schannel"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crypt32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "secur32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "scoped-tls"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "secur32-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "security-framework"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "semver"
 version = "0.1.20"
@@ -417,6 +682,33 @@ dependencies = [
  "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_json"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "slab"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "slog"
 version = "2.0.6"
@@ -454,6 +746,11 @@ dependencies = [
  "thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "smallvec"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "strsim"
 version = "0.6.0"
@@ -522,11 +819,24 @@ dependencies = [
  "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "take"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "take_mut"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "tempdir"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "term"
 version = "0.4.6"
@@ -576,21 +886,64 @@ dependencies = [
 ]
 
 [[package]]
-name = "traitobject"
-version = "0.1.0"
+name = "tokio-core"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "typeable"
-version = "0.1.2"
+name = "tokio-io"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "unicase"
-version = "1.4.2"
+name = "tokio-proto"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-service"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-tls"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -675,11 +1028,6 @@ name = "vec_map"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "version_check"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "void"
 version = "1.0.2"
@@ -713,35 +1061,56 @@ dependencies = [
 ]
 
 [metadata]
+"checksum adler32 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6cbd0b9af8587c72beadc9f72d35b9fbb070982c9e6203e46e93f10df25f8f45"
+"checksum advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a"
 "checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
 "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
 "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
-"checksum base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30e93c03064e7590d0466209155251b90c22e37fab1daf2771582598b5827557"
 "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
 "checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
 "checksum byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d"
+"checksum bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d828f97b58cc5de3e40c421d0cf2132d6b2da4ee0e11b8632fa838f0f9333ad6"
+"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
 "checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
 "checksum clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "867a885995b4184be051b70a592d4d70e32d7a188db6e8dff626af286a962771"
+"checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
+"checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
+"checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
 "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
+"checksum crypt32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e34988f7e069e0b2f3bfc064295161e489b2d4e04a2e4248fb94360cdf00b4ec"
+"checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
+"checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90"
 "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
+"checksum futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4b63a4792d4f8f686defe3b39b92127fea6344de5d38202b2ee5a11bbbf29d6a"
+"checksum futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a283c84501e92cade5ea673a2a7ca44f71f209ccdd302a3e0896f50083d2c5ff"
 "checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
-"checksum hyper 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)" = "0f01e4a20f5dfa5278d7762b7bdb7cab96e24378b9eca3889fbd4b5e94dc7063"
+"checksum hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "641abc3e3fcf0de41165595f801376e01106bca1fd876dda937730e477ca004c"
+"checksum hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c81fa95203e2a6087242c38691a0210f23e9f3f8f944350bd676522132e2985"
 "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
+"checksum iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29d062ee61fccdf25be172e70f34c9f6efc597e1fb8f6526e8437b2046ab26be"
 "checksum ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)" = "232e76922883005380e831068f731ef0305541c9f77b30df3a1635047b16f370"
 "checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
+"checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
+"checksum lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b585b7a6811fb03aa10e74b278a0f00f8dd9b45dc681f148bb29fa5cb61859b"
 "checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503"
+"checksum libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "a2aa04ec0100812d31a5366130ff9e793291787bc31da845bede4a00ea329830"
 "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
+"checksum magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf0336886480e671965f794bc9b6fce88503563013d1bfb7a502c81fe3ac527"
+"checksum magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40d014c7011ac470ae28e2f76a02bfea4a8480f73e701353b49ad7a8d75f4699"
 "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
 "checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
-"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
 "checksum mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "153f98dde2b135dece079e5478ee400ae1bab13afa52d66590eacfc40e912435"
+"checksum mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "dbd91d3bfbceb13897065e97b2ef177a09a438cb33612b2d371bf568819a9313"
+"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+"checksum native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04b781c9134a954c84f0594b9ab3f5606abc516030388e8511887ef4c204a1e5"
+"checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
 "checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525"
 "checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba"
 "checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
@@ -755,21 +1124,32 @@ dependencies = [
 "checksum pnet_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e77669156bd4cb7732fc11261a33cc56705100e3bed019ee1cbd84d97e2d9909"
 "checksum pnet_macros_support 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c79f254137dcce415bdf2c10b40cf74009a7a8d4a17985cc7773b41f7ccfaf1"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
+"checksum rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "eb250fd207a4729c976794d03db689c9be1d634ab5a1c9da9492a13d8fecbcdf"
 "checksum redox_syscall 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "9df6a71a1e67be2104410736b2389fb8e383c1d7e9e792d629ff13c02867147a"
 "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
 "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
+"checksum reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5866613d84e2a39c0479a960bf2d0eff1fbfc934f02cd42b5c08c1e1efc5b1fd"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
 "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
+"checksum schannel 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "14a5f8491ae5fc8c51aded1f5806282a0218b4d69b1b76913a0559507e559b90"
+"checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d"
+"checksum secur32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f412dfa83308d893101dd59c10d6fda8283465976c28c287c5c855bf8d216bc"
+"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332"
+"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead"
 "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
 "checksum serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f7726f29ddf9731b17ff113c461e362c381d9d69433f79de4f3dd572488823e9"
 "checksum serde-xml-rs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fce1909691944ee6e9b9e6da69dee5d61e37e5b2fa0b85543d8529412f86f6e"
 "checksum serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cf823e706be268e73e7747b147aa31c8f633ab4ba31f115efb57e5047c3a76dd"
 "checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a"
+"checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b"
+"checksum serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce0fd303af908732989354c6f02e05e2e6d597152870f2c6990efb0577137480"
+"checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
 "checksum slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "057f354e538bfb65380f06810d2ab85933872563b20f53daa8144e5beae3aa3b"
 "checksum slog-async 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afbebab3918ccc36e83dca6879dbe554fc2874d1c26e3dd5debf646a5ee60936"
 "checksum slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd3236e1818c147ed3003930289dc6457425aaca3a7dbb6b7f3032f075d865c5"
 "checksum slog-term 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8734c9ff9a45be6026599e15aad5c29c2beb35113488b6945391853a011690"
+"checksum smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013"
 "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
@@ -777,15 +1157,19 @@ dependencies = [
 "checksum syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646"
 "checksum syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd49988e52451813c61fecbe9abb5cfd4e1b7bb6cdbb980a6fbcbab859171a6"
 "checksum syntex_syntax 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7628a0506e8f9666fdabb5f265d0059b059edac9a3f810bda077abb5d826bd8d"
+"checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5"
 "checksum take_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7986ceb18a0d75e1fcb8b27c0119389bbe05f016e5a6e54d003251acc1122108"
+"checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
 "checksum textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f86300c3e7416ee233abd7cda890c492007a3980f941f79185c753a701257167"
 "checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
 "checksum time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d788d3aa77bc0ef3e9621256885555368b47bd495c13dd2e7413c89f845520"
-"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
-"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
-"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+"checksum tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e85d419699ec4b71bfe35bbc25bb8771e52eff0471a7f75c853ad06e200b4f86"
+"checksum tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ab83e7adb5677e42e405fa4ceff75659d93c4d7d7dd22f52fcec59ee9f02af"
+"checksum tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389"
+"checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
+"checksum tokio-tls 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d88e411cac1c87e405e4090be004493c5d8072a370661033b1a64ea205ec2e13"
 "checksum unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e01da42520092d0cd2d6ac3ae69eb21a22ad43ff195676b86f8c37f487d6b80"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
@@ -799,7 +1183,6 @@ dependencies = [
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
 "checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b"
 "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
-"checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
diff --git a/Cargo.toml b/Cargo.toml
index b3099de1..e764922a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,9 +9,6 @@ users = "*"
 slog-term = "*"
 slog-async = "*"
 slog-scope = "*"
-# use an old version of hyper
-# because the new ones are weird
-hyper = "0.10"
 mime = "0.3"
 serde = "1.0"
 serde_derive = "1.0"
@@ -20,6 +17,8 @@ openssl = "0.9.17"
 base64 = "0.6"
 byteorder = "1.1"
 pnet = "0.19"
+reqwest = "0.7"
+hyper = "0.11"
 
 [dependencies.slog]
 version = "*"
diff --git a/src/lib.rs b/src/lib.rs
index 7cbab3f6..2178eeb7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,6 +14,7 @@
 
 #[macro_use]
 extern crate hyper;
+extern crate reqwest;
 
 #[macro_use]
 extern crate slog;
diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index 4d642089..30d705bf 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -20,12 +20,8 @@ use self::crypto::x509;
 
 use metadata::Metadata;
 
-use hyper::header;
-use hyper::mime;
-
 use pnet;
 
-
 use retry;
 
 use std::net::{IpAddr, Ipv4Addr};
@@ -98,7 +94,7 @@ struct Supported {
 }
 
 struct Azure {
-    client: retry::Client<retry::Xml>,
+    client: retry::Client,
     endpoint: IpAddr,
 }
 
@@ -106,10 +102,9 @@ impl Azure {
     fn new() -> Result<Self, String> {
         let addr = Azure::get_fabric_address()
             .map_err(wrap_error!("failed to get fabric address"))?;
-        let client = retry::Client::new(retry::Xml)
+        let client = retry::Client::new()?
             .header(MSAgentName(MS_AGENT_NAME.to_owned()))
-            .header(MSVersion(MS_VERSION.to_owned()))
-            .header(header::ContentType(mime::Mime(mime::TopLevel::Text, mime::SubLevel::Xml, vec![(mime::Attr::Charset, mime::Value::Utf8)])));
+            .header(MSVersion(MS_VERSION.to_owned()));
         let azure = Azure {
             client: client,
             endpoint: addr,
@@ -161,8 +156,7 @@ impl Azure {
     }
 
     fn is_fabric_compatible(&self, version: &str) -> Result<(), String> {
-        let versions: Versions = self.client.get(format!("http://{}/?comp=versions", self.endpoint))
-            .send()
+        let versions: Versions = self.client.get(retry::Xml, format!("http://{}/?comp=versions", self.endpoint)).send()
             .map_err(wrap_error!("failed to get versions"))?;
 
         if versions.supported.versions.iter().any(|v| v == version) {
@@ -173,8 +167,7 @@ impl Azure {
     }
 
     fn get_certs_endpoint(&self) -> Result<String, String> {
-        let goalstate: GoalState = self.client.get(format!("http://{}/machine/?comp=goalstate", self.endpoint))
-            .send()
+        let goalstate: GoalState = self.client.get(retry::Xml, format!("http://{}/machine/?comp=goalstate", self.endpoint)).send()
             .map_err(wrap_error!("failed to get goal state"))?;
 
         // grab the certificates endpoint from the xml and return it
@@ -184,7 +177,7 @@ impl Azure {
 
     fn get_certs(&self, endpoint: String, mangled_pem: String) -> Result<String, String> {
         // get the certificates
-        let certs: CertificatesFile = self.client.get(endpoint)
+        let certs: CertificatesFile = self.client.get(retry::Xml, endpoint)
             .header(MSCipherName("DES_EDE3_CBC".to_owned()))
             .header(MSCert(mangled_pem))
             .send()
diff --git a/src/retry/mod.rs b/src/retry/mod.rs
index bbd76658..4f205296 100644
--- a/src/retry/mod.rs
+++ b/src/retry/mod.rs
@@ -19,27 +19,29 @@
 //! of attempts and a backoff strategy. It also takes care of automatically
 //! deserializing responses and handles headers in a sane way.
 
-use hyper;
-use hyper::header;
+use std::io::Read;
+use std::time::Duration;
+use std::thread;
+
+use reqwest;
+use reqwest::header;
+use reqwest::header::ContentType;
+use reqwest::{Method,Request};
 
 use serde;
 use serde_xml_rs;
 
-use std::io::Read;
-use std::marker::Copy;
-
-#[derive(Debug)]
-pub struct Client<D>
-    where D: Deserializer
-{
-    headers: header::Headers,
-    deserializer: D,
-    client: hyper::client::Client,
-}
+#[inline(always)]
+pub fn default_initial_backoff() -> Duration { Duration::new(1,0) }
+#[inline(always)]
+pub fn default_max_backoff() -> Duration { Duration::new(5,0) }
+#[inline(always)]
+pub fn default_max_attempts() -> u32 { 0 }
 
 pub trait Deserializer {
     fn deserialize<'de, T>(&self, &str) -> Result<T, String>
         where T: serde::Deserialize<'de>;
+    fn content_type(&self) -> ContentType;
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -52,73 +54,179 @@ impl Deserializer for Xml {
         serde_xml_rs::deserialize(input.as_bytes())
             .map_err(wrap_error!("failed xml deserialization"))
     }
+    fn content_type(&self) -> ContentType {
+        ContentType("text/xml; charset=utf-8".parse().unwrap())
+    }
 }
 
-pub struct RequestBuilder<'a, D>
-    where D: Deserializer
-{
-    req: hyper::client::RequestBuilder<'a>,
-    deserializer: D,
-    uri: String,
+#[derive(Debug, Clone)]
+pub struct Client {
+    client: reqwest::Client,
+    headers: header::Headers,
+    initial_backoff: Duration,
+    max_backoff: Duration,
+    max_attempts: u32,
+    return_on_404: bool,
 }
 
-impl<'a, D> RequestBuilder<'a, D>
-    where D: Deserializer
-{
-    pub fn header<H>(mut self, header: H) -> Self
-        where H: header::Header + header::HeaderFormat
+impl Client {
+    pub fn new() -> Result<Self,String> {
+        let client = reqwest::Client::new()
+            .map_err(wrap_error!("failed to initialize client"))?;
+        Ok(Client{
+            client,
+            headers: header::Headers::new(),
+            initial_backoff: default_initial_backoff(),
+            max_backoff:  default_max_backoff(),
+            max_attempts: default_max_attempts(),
+            return_on_404: false,
+        })
+    }
+
+    pub fn header<H>(mut self, h: H) -> Self
+        where H: header::Header
     {
-        trace!("http request to '{}': adding header: {:?}", self.uri, header);
-        self.req = self.req.header(header);
+        self.headers.set(h);
         self
     }
 
-    pub fn send<'de, T>(self) -> Result<T, String>
-        where T: serde::Deserialize<'de> + 'de
-    {
-        // save uri for logging
-        let uri = self.uri;
+    pub fn initial_backoff(mut self, initial_backoff: Duration) -> Self {
+        self.initial_backoff = initial_backoff;
+        self
+    }
 
-        let mut res = self.req.send()
-            .map_err(wrap_error!("failed to request from uri '{}'", uri))?;
+    pub fn max_backoff(mut self, max_backoff: Duration) -> Self {
+        self.max_backoff = max_backoff;
+        self
+    }
 
-        let mut body = String::new();
-        res.read_to_string(&mut body)
-            .map_err(wrap_error!("failed to read response body"))?;
+    /// max_attempts will panic if the argument is greater than 500
+    pub fn max_attempts(mut self, max_attempts: u32) -> Self {
+        if max_attempts > 500 {
+            // Picking 500 as a max_attempts number arbitrarily, to prevent the mutually recursive
+            // functions dispatch_request and wait_then_retry from blowing up the stack
+            panic!("max_attempts cannot be greater than 500")
+        } else {
+            self.max_attempts = max_attempts;
+            self
+        }
+    }
 
-        trace!("http get response from '{}': {}", uri, body);
+    pub fn return_on_404(mut self, return_on_404: bool) -> Self {
+        self.return_on_404 = return_on_404;
+        self
+    }
 
-        self.deserializer.deserialize(&body)
-            .map_err(wrap_error!("failed to deserialize xml into versions struct"))
+    pub fn get<D>(&self, d: D, url: String) -> RequestBuilder<D>
+        where D: Deserializer
+    {
+        RequestBuilder{
+            url,
+            d,
+            client: self.client.clone(),
+            headers: self.headers.clone(),
+            initial_backoff: self.initial_backoff.clone(),
+            max_backoff: self.max_backoff.clone(),
+            max_attempts: self.max_attempts.clone(),
+            return_on_404: self.return_on_404.clone(),
+        }
     }
 }
 
-impl<D> Client<D>
-    where D: Deserializer + Copy
+pub struct RequestBuilder<D>
+    where D: Deserializer
+{
+    url: String,
+    d: D,
+    client: reqwest::Client,
+    headers: header::Headers,
+    initial_backoff: Duration,
+    max_backoff: Duration,
+    max_attempts: u32,
+    return_on_404: bool,
+}
+
+impl<D> RequestBuilder<D>
+    where D: Deserializer
 {
-    pub fn new(deserializer: D) -> Self {
-        Client {
-            deserializer: deserializer,
-            headers: header::Headers::new(),
-            client: hyper::client::Client::new(),
-        }
-    }
 
-    pub fn header<H>(mut self, header: H) -> Self
-        where H: header::Header + header::HeaderFormat
+    pub fn header<H>(mut self, h: H) -> Self
+        where H: header::Header
     {
-        self.headers.set(header);
+        self.headers.set(h);
         self
     }
 
-    pub fn get(&self, uri: String) -> RequestBuilder<D> {
-        trace!("http get request to '{}' with headers '{:?}'", uri, self.headers);
+    pub fn send<'de, T>(&self) -> Result<T, String>
+        where T: serde::Deserialize<'de> + 'de
+    {
+        let url = reqwest::Url::parse(self.url.as_str())
+            .map_err(wrap_error!("failed to parse uri"))?;
+        let mut req = Request::new(Method::Get, url);
+        req.headers_mut().extend(self.headers.iter());
+        req.headers_mut().set(self.d.content_type());
+        self.dispatch_request(req, self.initial_backoff, 0)
+    }
+
+    fn dispatch_request<'de, T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T, String>
+        where T: serde::Deserialize<'de> + 'de
+    {
+        info!("Fetching {}: Attempt#{}", req.url(), num_attempts + 1);
+
+        match self.client.execute(clone_request(&req)) {
+            Ok(mut resp) => {
+                match (resp.status(), self.return_on_404) {
+                    (reqwest::StatusCode::Ok,_) => {
+                        let mut buf = String::new();
+                        match resp.read_to_string(&mut buf) {
+                            Ok(_) => {
+                                self.d.deserialize(buf.as_str())
+                                    .map_err(wrap_error!("failed to deserialize data"))
+                            }
+                            Err(e) => {
+                                info!("error reading body: {}", e);
+                                self.wait_then_retry(req, delay, num_attempts)
+                            }
+                        }
+                    }
+                    (reqwest::StatusCode::NotFound,true) => {
+                        // TODO: return empty (failed?)
+                        error!("Failed to fetch: should return!");
+                        self.wait_then_retry(req, delay, num_attempts)
+                    }
+                    (s,_) => {
+                        info!("Failed to fetch: {}", s);
+                        self.wait_then_retry(req, delay, num_attempts)
+                    }
+                }
+            }
+            Err(e) => {
+                info!("Failed to fetch: {}", e);
+                self.wait_then_retry(req, delay, num_attempts)
+            }
+        }
+    }
 
-        let req = self.client.get(&uri).headers(self.headers.clone());
-        RequestBuilder {
-            req: req,
-            uri: uri,
-            deserializer: self.deserializer,
+    fn wait_then_retry<'de, T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T, String>
+        where T: serde::Deserialize<'de> + 'de
+    {
+        thread::sleep(delay);
+        let delay = if self.max_backoff != Duration::new(0,0) && delay * 2 > self.max_backoff {
+                self.max_backoff
+            } else {
+                delay * 2
+            };
+        let num_attempts = num_attempts + 1;
+        if self.max_attempts != 0 && num_attempts == self.max_attempts {
+            Err(format!("Timed out while fetching {}", req.url()))
+        } else {
+            self.dispatch_request(req, delay, num_attempts)
         }
     }
 }
+
+fn clone_request(req: &Request) -> Request {
+    let mut newreq = Request::new(req.method().clone(), req.url().clone());
+    newreq.headers_mut().extend(req.headers().iter());
+    newreq
+}

From 66f24780419b5bbf322d418ce9fde2ecbeee8a3c Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Wed, 23 Aug 2017 16:20:37 -0700
Subject: [PATCH 24/71] *: move to error-chain

this moves from our error macros to the error-chain library, which lets
us implicitely keep a chain of underlying errors for logging purposes.
---
 Cargo.lock                              | 51 ++++++++++++++++++++++
 Cargo.toml                              |  1 +
 src/bin/coreos-metadata.rs              | 36 ++++++++-------
 src/lib.rs                              | 33 ++++++++++++--
 src/macros.rs                           | 56 ------------------------
 src/metadata.rs                         | 34 ++++++++-------
 src/providers/azure/crypto/mod.rs       | 32 ++++++--------
 src/providers/azure/crypto/ssh.rs       |  6 +--
 src/providers/azure/crypto/x509.rs      | 58 +++++++++++--------------
 src/providers/azure/mod.rs              | 52 +++++++++++-----------
 src/providers/digitalocean/mod.rs       |  4 +-
 src/providers/ec2/mod.rs                |  4 +-
 src/providers/gce/mod.rs                |  4 +-
 src/providers/openstack/mod.rs          |  4 +-
 src/providers/packet/mod.rs             |  4 +-
 src/providers/vagrant_virtualbox/mod.rs |  4 +-
 src/retry/mod.rs                        | 24 +++++-----
 src/ssh.rs                              | 24 +++++-----
 18 files changed, 231 insertions(+), 200 deletions(-)
 delete mode 100644 src/macros.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0ee7eb8d..d61db83d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,6 +5,7 @@ dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -57,6 +58,29 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "backtrace"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "base64"
 version = "0.6.0"
@@ -169,11 +193,28 @@ name = "custom_derive"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "dbghelp-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "dtoa"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "error-chain"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.2.0"
@@ -577,6 +618,11 @@ dependencies = [
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "rustc-serialize"
 version = "0.3.24"
@@ -1066,6 +1112,8 @@ dependencies = [
 "checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
 "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
 "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
+"checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76"
+"checksum backtrace-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "afccc5772ba333abccdf60d55200fa3406f8c59dcf54d5f7998c9107d3799c7c"
 "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
 "checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
@@ -1081,7 +1129,9 @@ dependencies = [
 "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
 "checksum crypt32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e34988f7e069e0b2f3bfc064295161e489b2d4e04a2e4248fb94360cdf00b4ec"
 "checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
+"checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
 "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90"
+"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
 "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
 "checksum futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4b63a4792d4f8f686defe3b39b92127fea6344de5d38202b2ee5a11bbbf29d6a"
 "checksum futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a283c84501e92cade5ea673a2a7ca44f71f209ccdd302a3e0896f50083d2c5ff"
@@ -1129,6 +1179,7 @@ dependencies = [
 "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
 "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
 "checksum reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5866613d84e2a39c0479a960bf2d0eff1fbfc934f02cd42b5c08c1e1efc5b1fd"
+"checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
 "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
diff --git a/Cargo.toml b/Cargo.toml
index e764922a..79248386 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,7 @@ byteorder = "1.1"
 pnet = "0.19"
 reqwest = "0.7"
 hyper = "0.11"
+error-chain = "0.10"
 
 [dependencies.slog]
 version = "*"
diff --git a/src/bin/coreos-metadata.rs b/src/bin/coreos-metadata.rs
index 4e710bff..8f28c9c1 100644
--- a/src/bin/coreos-metadata.rs
+++ b/src/bin/coreos-metadata.rs
@@ -15,6 +15,8 @@
 #[macro_use]
 extern crate clap;
 #[macro_use]
+extern crate error_chain;
+#[macro_use]
 extern crate slog;
 extern crate slog_term;
 extern crate slog_async;
@@ -22,7 +24,6 @@ extern crate slog_async;
 extern crate slog_scope;
 extern crate users;
 
-#[macro_use]
 extern crate coreos_metadata;
 
 use std::fs::File;
@@ -31,6 +32,7 @@ use clap::{Arg, App};
 use slog::Drain;
 
 use coreos_metadata::fetch_metadata;
+use coreos_metadata::errors::*;
 
 const CMDLINE_PATH: &'static str = "/proc/cmdline";
 const CMDLINE_OEM_FLAG:&'static str = "coreos.oem.id";
@@ -44,7 +46,9 @@ struct Config {
     network_units_dir: Option<String>,
 }
 
-fn main() {
+quick_main!(run);
+
+fn run() -> Result<()> {
     // setup logging
     let decorator = slog_term::TermDecorator::new().build();
     let drain = slog_term::FullFormat::new(decorator).build().fuse();
@@ -56,38 +60,40 @@ fn main() {
 
     // initialize program
     let config = init()
-        .unwrap_or_else(log_and_die!("initialization"));
+        .chain_err(|| format!("initialization"))?;
 
     trace!("cli configuration - {:?}", config);
 
     // fetch the metadata from the configured provider
     let metadata = fetch_metadata(&config.provider)
-        .unwrap_or_else(log_and_die!("fetching metadata from provider"));
+        .chain_err(|| format!("fetching metadata from provider"))?;
 
     // write attributes if configured to do so
     config.attributes_file
         .map_or(Ok(()), |x| metadata.write_attributes(x))
-        .unwrap_or_else(log_and_die!("writing metadata attributes"));
+        .chain_err(|| format!("writing metadata attributes"))?;
 
     // write ssh keys if configured to do so
     config.ssh_keys_user
         .map_or(Ok(()), |x| metadata.write_ssh_keys(x))
-        .unwrap_or_else(log_and_die!("writing ssh keys"));
+        .chain_err(|| format!("writing ssh keys"))?;
 
     // write hostname if configured to do so
     config.hostname_file
         .map_or(Ok(()), |x| metadata.write_hostname(x))
-        .unwrap_or_else(log_and_die!("writing hostname"));
+        .chain_err(|| format!("writing hostname"))?;
 
     // write network units if configured to do so
     config.network_units_dir
         .map_or(Ok(()), |x| metadata.write_network_units(x))
-        .unwrap_or_else(log_and_die!("writing network units"));
+        .chain_err(|| format!("writing network units"))?;
+
+    debug!("Done!");
 
-    debug!("Done!")
+    Ok(())
 }
 
-fn init() -> Result<Config, String> {
+fn init() -> Result<Config> {
     // setup cli
     let matches = App::new("coreos-metadata")
         .version(crate_version!())
@@ -123,7 +129,7 @@ fn init() -> Result<Config, String> {
             None => if matches.is_present("cmdline") {
                 get_oem()?
             } else {
-                return Err("Must set either --provider or --cmdline".to_string());
+                return Err("Must set either --provider or --cmdline".into());
             }
         },
         attributes_file: matches.value_of("attributes").map(String::from),
@@ -133,15 +139,15 @@ fn init() -> Result<Config, String> {
     })
 }
 
-fn get_oem() -> Result<String, String> {
+fn get_oem() -> Result<String> {
     // open the cmdline file
     let mut file = File::open(CMDLINE_PATH)
-        .map_err(wrap_error!("Failed to open cmdline file ({})", CMDLINE_PATH))?;
+        .chain_err(|| format!("Failed to open cmdline file ({})", CMDLINE_PATH))?;
 
     // read the contents
     let mut contents = String::new();
     file.read_to_string(&mut contents)
-        .map_err(wrap_error!("Failed to read cmdline file ({})", CMDLINE_PATH))?;
+        .chain_err(|| format!("Failed to read cmdline file ({})", CMDLINE_PATH))?;
 
     // split the contents into elements
     let params: Vec<Vec<&str>> = contents.split(' ')
@@ -155,5 +161,5 @@ fn get_oem() -> Result<String, String> {
         }
     }
 
-    Err(format!("Couldn't find '{}' flag in cmdline file ({})", CMDLINE_OEM_FLAG, CMDLINE_PATH))
+    Err(format!("Couldn't find '{}' flag in cmdline file ({})", CMDLINE_OEM_FLAG, CMDLINE_PATH).into())
 }
diff --git a/src/lib.rs b/src/lib.rs
index 2178eeb7..00a9fc37 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,6 +16,12 @@
 extern crate hyper;
 extern crate reqwest;
 
+extern crate base64;
+extern crate byteorder;
+
+#[macro_use]
+extern crate error_chain;
+
 #[macro_use]
 extern crate slog;
 #[macro_use]
@@ -32,21 +38,40 @@ extern crate openssl;
 
 extern crate users;
 
-#[macro_use]
-mod macros;
 mod providers;
 mod metadata;
 mod ssh;
 mod network;
 mod retry;
 
+pub mod errors {
+    error_chain!{
+        foreign_links {
+            Log(::slog::Error);
+            XmlDeserialize(::serde_xml_rs::Error);
+            Base64Decode(::base64::DecodeError);
+            Io(::std::io::Error);
+            Reqwest(::reqwest::Error);
+            Hyper(::hyper::error::Error);
+        }
+        errors {
+            UnknownProvider(p: String) {
+                description("unknown provider")
+                display("unknown provider '{}'", p)
+            }
+        }
+    }
+}
+
 use providers::*;
 use metadata::Metadata;
 
+use errors::*;
+
 /// fetch_metadata is the generic, top-level function that is used by the main
 /// function to fetch metadata. The configured provider is passed in and this
 /// function dispatches the call to the correct provider-specific fetch function
-pub fn fetch_metadata(provider: &str) -> Result<Metadata, String> {
+pub fn fetch_metadata(provider: &str) -> Result<Metadata> {
     match provider {
         "azure" => azure::fetch_metadata(),
         "digitalocean" => digitalocean::fetch_metadata(),
@@ -55,6 +80,6 @@ pub fn fetch_metadata(provider: &str) -> Result<Metadata, String> {
         "openstack" => openstack::fetch_metadata(),
         "packet" => packet::fetch_metadata(),
         "vagrant_virtualbox" => vagrant_virtualbox::fetch_metadata(),
-        _ => Err(format!("unknown provider '{}'", provider)),
+        _ => Err(errors::ErrorKind::UnknownProvider(provider.to_owned()).into()),
     }
 }
diff --git a/src/macros.rs b/src/macros.rs
deleted file mode 100644
index 358db858..00000000
--- a/src/macros.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2017 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! macros for use across the coreos-metadata project
-
-#[macro_export]
-macro_rules! log_and_die {
-    () => {
-        |err| {
-            error!("error"; "error" => err);
-            panic!()
-        }
-    };
-    ($fmt:expr) => {
-        |err| {
-            error!($fmt; "error" => err);
-            panic!()
-        }
-    };
-    ($fmt:expr, $($arg:tt)*) => {
-        |err| {
-            error!($fmt, $($arg)*; "error" => err);
-            panic!()
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! wrap_error {
-    () => {
-        |err| {
-            format!("error: {}", err)
-        }
-    };
-    ($fmt:expr) => {
-        |err| {
-            format!(concat!($fmt, ": {}"), err)
-        }
-    };
-    ($fmt:expr, $($arg:tt)*) => {
-        |err| {
-            format!(concat!($fmt, ": {}"), $($arg)*, err)
-        }
-    };
-}
diff --git a/src/metadata.rs b/src/metadata.rs
index 36a81e28..d8fa55e1 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -21,6 +21,8 @@ use users;
 use ssh;
 use network;
 
+use errors::*;
+
 pub struct MetadataBuilder {
     metadata: Metadata,
 }
@@ -33,16 +35,16 @@ pub struct Metadata {
     net_dev: Vec<network::Device>,
 }
 
-fn create_file(filename: String) -> Result<File, String> {
+fn create_file(filename: String) -> Result<File> {
     let file_path = Path::new(&filename);
     // create the directories if they don't exist
     let folder = file_path.parent()
         .ok_or(format!("could not get parent directory of {:?}", file_path))?;
     fs::create_dir_all(&folder)
-        .map_err(wrap_error!("failed to create directory {:?}", folder))?;
+        .chain_err(|| format!("failed to create directory {:?}", folder))?;
     // create (or truncate) the file we want to write to
     File::create(file_path)
-        .map_err(wrap_error!("failed to create file {:?}", file_path))
+        .chain_err(|| format!("failed to create file {:?}", file_path))
 }
 
 impl MetadataBuilder {
@@ -97,15 +99,15 @@ impl Metadata {
         }
     }
 
-    pub fn write_attributes(&self, attributes_file_path: String) -> Result<(), String> {
+    pub fn write_attributes(&self, attributes_file_path: String) -> Result<()> {
         let mut attributes_file = create_file(attributes_file_path)?;
         for (k,v) in &self.attributes {
             write!(&mut attributes_file, "COREOS_{}={}\n", k, v)
-                .map_err(wrap_error!("failed to write attributes to file {:?}", attributes_file))?;
+                .chain_err(|| format!("failed to write attributes to file {:?}", attributes_file))?;
         }
         Ok(())
     }
-    pub fn write_ssh_keys(&self, ssh_keys_user: String) -> Result<(), String> {
+    pub fn write_ssh_keys(&self, ssh_keys_user: String) -> Result<()> {
         // this function actually needs to be pretty complicated
         // and we need a new tool that does this generically for rust anyway
         // so I actually just have to rewrite update-ssh-keys
@@ -113,40 +115,40 @@ impl Metadata {
             .ok_or(format!("could not find user with username {:?}", ssh_keys_user))?;
         let authorized_keys_dir = ssh::create_authorized_keys_dir(user)?;
         let mut authorized_keys_file = File::create(authorized_keys_dir.join("coreos-metadata"))
-            .map_err(wrap_error!("failed to create the file {:?} in the ssh authorized users directory", "coreos-metadata"))?;
+            .chain_err(|| format!("failed to create the file {:?} in the ssh authorized users directory", "coreos-metadata"))?;
         for ssh_key in &self.ssh_keys {
             write!(&mut authorized_keys_file, "{}\n", ssh_key)
-                .map_err(wrap_error!("failed to write ssh key to file {:?}", authorized_keys_file))?;
+                .chain_err(|| format!("failed to write ssh key to file {:?}", authorized_keys_file))?;
         }
         ssh::sync_authorized_keys(authorized_keys_dir)
     }
-    pub fn write_hostname(&self, hostname_file_path: String) -> Result<(), String> {
+    pub fn write_hostname(&self, hostname_file_path: String) -> Result<()> {
         match self.hostname {
             Some(ref hostname) => {
                 let mut hostname_file = create_file(hostname_file_path)?;
                 write!(&mut hostname_file, "{}\n", hostname)
-                    .map_err(wrap_error!("failed to write hostname {:?} to file {:?}", self.hostname, hostname_file))
+                    .chain_err(|| format!("failed to write hostname {:?} to file {:?}", self.hostname, hostname_file))
             }
             None => Ok(())
         }
     }
-    pub fn write_network_units(&self, network_units_dir: String) -> Result<(), String> {
+    pub fn write_network_units(&self, network_units_dir: String) -> Result<()> {
         let dir_path = Path::new(&network_units_dir);
         fs::create_dir_all(&dir_path)
-            .map_err(wrap_error!("failed to create directory {:?}", dir_path))?;
+            .chain_err(|| format!("failed to create directory {:?}", dir_path))?;
         for interface in &self.network {
             let file_path = dir_path.join(interface.unit_name());
             let mut unit_file = File::create(&file_path)
-                .map_err(wrap_error!("failed to create file {:?}", file_path))?;
+                .chain_err(|| format!("failed to create file {:?}", file_path))?;
             write!(&mut unit_file, "{}", interface.config())
-                .map_err(wrap_error!("failed to write network interface unit file {:?}", unit_file))?;
+                .chain_err(|| format!("failed to write network interface unit file {:?}", unit_file))?;
         }
         for device in &self.net_dev {
             let file_path = dir_path.join(device.unit_name());
             let mut unit_file = File::create(&file_path)
-                .map_err(wrap_error!("failed to create file {:?}", file_path))?;
+                .chain_err(|| format!("failed to create file {:?}", file_path))?;
             write!(&mut unit_file, "{}", device.config())
-                .map_err(wrap_error!("failed to write network device unit file {:?}", unit_file))?;
+                .chain_err(|| format!("failed to write network device unit file {:?}", unit_file))?;
         }
         Ok(())
     }
diff --git a/src/providers/azure/crypto/mod.rs b/src/providers/azure/crypto/mod.rs
index d8a766a9..30fe0704 100644
--- a/src/providers/azure/crypto/mod.rs
+++ b/src/providers/azure/crypto/mod.rs
@@ -22,20 +22,14 @@ use openssl::pkey::PKey;
 use openssl::cms::CmsContentInfo;
 use openssl::pkcs12::Pkcs12;
 
-macro_rules! wrap_error {
-    ($x:expr) => {
-        |err| {
-            format!("{}: {}", $x, err)
-        }
-    };
-}
+use errors::*;
 
-pub fn mangle_pem(x509: &X509) -> Result<String, String> {
+pub fn mangle_pem(x509: &X509) -> Result<String> {
     // get the pem
     let pem = x509.to_pem()
-        .map_err(wrap_error!("failed to convert x509 cert to pem"))?;
+        .chain_err(|| format!("failed to convert x509 cert to pem"))?;
     let pem = String::from_utf8(pem)
-        .map_err(wrap_error!("failed to convert x509 pem file from utf8 to a string"))?;
+        .chain_err(|| format!("failed to convert x509 pem file from utf8 to a string"))?;
 
     // the pem needs to be mangled to send as a header
     Ok(pem.lines()
@@ -43,37 +37,37 @@ pub fn mangle_pem(x509: &X509) -> Result<String, String> {
         .fold(String::new(), |mut s, l| {s.push_str(l); s}))
 }
 
-pub fn decrypt_cms(smime: &[u8], pkey: &PKey, x509: &X509) -> Result<Vec<u8>, String> {
+pub fn decrypt_cms(smime: &[u8], pkey: &PKey, x509: &X509) -> Result<Vec<u8>> {
     // now we need to read in that mime file
     let cms = CmsContentInfo::smime_read_cms(smime)
-        .map_err(wrap_error!("failed to read cms file"))?;
+        .chain_err(|| format!("failed to read cms file"))?;
 
     // and decrypt it's contents
     let p12_der = cms.decrypt(&pkey, &x509)
-        .map_err(wrap_error!("failed to decrypt cms file"))?;
+        .chain_err(|| format!("failed to decrypt cms file"))?;
 
     Ok(p12_der)
 }
 
-pub fn p12_to_ssh_pubkey(p12_der: &[u8]) -> Result<String, String> {
+pub fn p12_to_ssh_pubkey(p12_der: &[u8]) -> Result<String> {
     // the contents of that encrypted cms blob we got are actually a different
     // cryptographic structure. we read that in from the contents and parse it.
     // PKCS12 has the ability to have a password, but we don't have one, hence
     // empty string.
     let p12 = Pkcs12::from_der(&p12_der)
-        .map_err(wrap_error!("failed to get pkcs12 blob from der"))?;
+        .chain_err(|| format!("failed to get pkcs12 blob from der"))?;
     let p12 = p12.parse("")
-        .map_err(wrap_error!("failed to parse pkcs12 blob"))?;
+        .chain_err(|| format!("failed to parse pkcs12 blob"))?;
 
     // PKCS12 has three parts. A pkey, a main x509 cert, and a list of other
     // x509 certs. The list of other x509 certs is called the chain. there is
     // only one cert in this chain, and it is the ssh public key.
     let ssh_pubkey_pem = p12.chain.get(0).unwrap();
-    // .map_err(wrap_error!("failed to get cert from pkcs12 chain"))?;
+    // .chain_err(|| format!("failed to get cert from pkcs12 chain"))?;
     let ssh_pubkey_pem = ssh_pubkey_pem.public_key() // get the public key from the x509 cert
-        .map_err(wrap_error!("failed to get public key from cert"))?;
+        .chain_err(|| format!("failed to get public key from cert"))?;
     let ssh_pubkey_pem = ssh_pubkey_pem.rsa()        // get the rsa contents from the pkey struct
-        .map_err(wrap_error!("failed to get rsa contents from pkey"))?;
+        .chain_err(|| format!("failed to get rsa contents from pkey"))?;
 
     // so now I have a pkey struct which represents my rsa public key. This is
     // my ssh public key. However, I can only export it in pem or der. Ther are
diff --git a/src/providers/azure/crypto/ssh.rs b/src/providers/azure/crypto/ssh.rs
index 28914ee5..b12cea74 100644
--- a/src/providers/azure/crypto/ssh.rs
+++ b/src/providers/azure/crypto/ssh.rs
@@ -30,11 +30,9 @@
 //! println!("my ssh public key: {}", ssh_pubkey);
 //! ```
 
-extern crate base64;
-extern crate byteorder;
-extern crate openssl;
+use base64;
 
-use self::byteorder::{WriteBytesExt, BigEndian};
+use byteorder::{WriteBytesExt, BigEndian};
 
 use openssl::rsa::Rsa;
 use openssl::bn;
diff --git a/src/providers/azure/crypto/x509.rs b/src/providers/azure/crypto/x509.rs
index 22e26eaa..f1eb0f35 100644
--- a/src/providers/azure/crypto/x509.rs
+++ b/src/providers/azure/crypto/x509.rs
@@ -14,8 +14,6 @@
 
 //! Generate X509 certificate and associated RSA public/private keypair
 
-extern crate openssl;
-
 use openssl::x509::{X509, X509Name};
 use openssl::rsa::Rsa;
 use openssl::pkey::PKey;
@@ -25,13 +23,7 @@ use openssl::bn;
 use openssl::conf::{Conf, ConfMethod};
 use openssl::x509::extension;
 
-macro_rules! wrap_error {
-    ($x:expr) => {
-        |err| {
-            format!("{}: {}", $x, err)
-        }
-    };
-}
+use errors::*;
 
 pub struct Config {
     rsa_bits: u32,
@@ -47,53 +39,53 @@ impl Config {
     }
 }
 
-pub fn generate_cert(config: Config) -> Result<(X509, PKey), String> {
+pub fn generate_cert(config: Config) -> Result<(X509, PKey)> {
     // generate an rsa public/private keypair
     let rsa = Rsa::generate(config.rsa_bits)
-        .map_err(wrap_error!("failed to generate rsa keypair"))?;
+        .chain_err(|| format!("failed to generate rsa keypair"))?;
     // put it into the pkey struct
     let pkey = PKey::from_rsa(rsa)
-        .map_err(wrap_error!("failed to create pkey struct from rsa keypair"))?;
+        .chain_err(|| format!("failed to create pkey struct from rsa keypair"))?;
 
     // make a new x509 certificate with the pkey we generated
     let mut x509builder = X509::builder()
-        .map_err(wrap_error!("failed to make x509 builder"))?;
+        .chain_err(|| format!("failed to make x509 builder"))?;
     x509builder.set_version(2)
-        .map_err(wrap_error!("failed to set x509 version"))?;
+        .chain_err(|| format!("failed to set x509 version"))?;
 
     // set the serial number to some big random positive integer
     let mut serial = bn::BigNum::new()
-        .map_err(wrap_error!("failed to make new bignum"))?;
+        .chain_err(|| format!("failed to make new bignum"))?;
     serial.rand(32, bn::MSB_ONE, false)
-        .map_err(wrap_error!("failed to generate random bignum"))?;
+        .chain_err(|| format!("failed to generate random bignum"))?;
     let serial = serial.to_asn1_integer()
-        .map_err(wrap_error!("failed to get asn1 integer from bignum"))?;
+        .chain_err(|| format!("failed to get asn1 integer from bignum"))?;
     x509builder.set_serial_number(&serial)
-        .map_err(wrap_error!("failed to set x509 serial number"))?;
+        .chain_err(|| format!("failed to set x509 serial number"))?;
 
     // call fails without expiration dates
     // I guess they are important anyway, but still
     x509builder.set_not_before(&Asn1Time::days_from_now(0).unwrap())
-        .map_err(wrap_error!("failed to set x509 start date"))?;
+        .chain_err(|| format!("failed to set x509 start date"))?;
     x509builder.set_not_after(&Asn1Time::days_from_now(config.expire_in_days).unwrap())
-        .map_err(wrap_error!("failed to set x509 expiration date"))?;
+        .chain_err(|| format!("failed to set x509 expiration date"))?;
 
     // add the issuer and subject name
     // it's set to "/CN=LinuxTransport"
     // if we want we can make that configurable later
     let mut x509namebuilder = X509Name::builder()
-        .map_err(wrap_error!("failed to get x509name builder"))?;
+        .chain_err(|| format!("failed to get x509name builder"))?;
     x509namebuilder.append_entry_by_text("CN", "LinuxTransport")
-        .map_err(wrap_error!("failed to append /CN=LinuxTransport to x509name builder"))?;
+        .chain_err(|| format!("failed to append /CN=LinuxTransport to x509name builder"))?;
     let x509name = x509namebuilder.build();
     x509builder.set_issuer_name(&x509name)
-        .map_err(wrap_error!("failed to set x509 issuer name"))?;
+        .chain_err(|| format!("failed to set x509 issuer name"))?;
     x509builder.set_subject_name(&x509name)
-        .map_err(wrap_error!("failed to set x509 subject name"))?;
+        .chain_err(|| format!("failed to set x509 subject name"))?;
 
     // set the public key
     x509builder.set_pubkey(&pkey)
-        .map_err(wrap_error!("failed to set x509 pubkey"))?;
+        .chain_err(|| format!("failed to set x509 pubkey"))?;
 
     // it also needs several extensions
     // in the openssl configuration file, these are set when generating certs
@@ -105,15 +97,15 @@ pub fn generate_cert(config: Config) -> Result<(X509, PKey), String> {
     // need to add them manually.
     // we need to do them one at a time, and they need to be in this order
     let conf = Conf::new(ConfMethod::default())
-        .map_err(wrap_error!("failed to make new conf struct"))?;
+        .chain_err(|| format!("failed to make new conf struct"))?;
     // it seems like everything depends on the basic constraints, so let's do
     // that first.
     let bc = extension::BasicConstraints::new()
         .ca()
         .build()
-        .map_err(wrap_error!("failed to build BasicConstraints extension"))?;
+        .chain_err(|| format!("failed to build BasicConstraints extension"))?;
     x509builder.append_extension(bc)
-        .map_err(wrap_error!("failed to append BasicConstraints extension"))?;
+        .chain_err(|| format!("failed to append BasicConstraints extension"))?;
 
     // the akid depends on the skid. I guess it copies the skid when the cert is
     // self-signed or something, I'm not really sure.
@@ -123,10 +115,10 @@ pub fn generate_cert(config: Config) -> Result<(X509, PKey), String> {
         let ext_con = x509builder.x509v3_context(None, Some(&conf));
         extension::SubjectKeyIdentifier::new()
             .build(&ext_con)
-            .map_err(wrap_error!("failed to build SubjectKeyIdentifier extention"))?
+            .chain_err(|| format!("failed to build SubjectKeyIdentifier extention"))?
     };
     x509builder.append_extension(skid)
-        .map_err(wrap_error!("failed to append SubjectKeyIdentifier extention"))?;
+        .chain_err(|| format!("failed to append SubjectKeyIdentifier extention"))?;
 
     // now that the skid is added we can add the akid
     let akid = {
@@ -135,14 +127,14 @@ pub fn generate_cert(config: Config) -> Result<(X509, PKey), String> {
             .keyid(true)
             .issuer(false)
             .build(&ext_con)
-            .map_err(wrap_error!("failed to build AuthorityKeyIdentifier extention"))?
+            .chain_err(|| format!("failed to build AuthorityKeyIdentifier extention"))?
     };
     x509builder.append_extension(akid)
-        .map_err(wrap_error!("failed to append AuthorityKeyIdentifier extention"))?;
+        .chain_err(|| format!("failed to append AuthorityKeyIdentifier extention"))?;
 
     // self-sign the certificate
     x509builder.sign(&pkey, MessageDigest::sha256())
-        .map_err(wrap_error!("failed to self-sign x509 cert"))?;
+        .chain_err(|| format!("failed to self-sign x509 cert"))?;
 
     let x509 = x509builder.build();
 
diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index 30d705bf..abe064bb 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -18,6 +18,8 @@ mod crypto;
 
 use self::crypto::x509;
 
+use errors::*;
+
 use metadata::Metadata;
 
 use pnet;
@@ -99,9 +101,9 @@ struct Azure {
 }
 
 impl Azure {
-    fn new() -> Result<Self, String> {
+    fn new() -> Result<Self> {
         let addr = Azure::get_fabric_address()
-            .map_err(wrap_error!("failed to get fabric address"))?;
+            .chain_err(|| format!("failed to get fabric address"))?;
         let client = retry::Client::new()?
             .header(MSAgentName(MS_AGENT_NAME.to_owned()))
             .header(MSVersion(MS_VERSION.to_owned()));
@@ -110,14 +112,14 @@ impl Azure {
             endpoint: addr,
         };
         azure.is_fabric_compatible(MS_VERSION)
-            .map_err(wrap_error!("failed version compatibility check"))?;
+            .chain_err(|| format!("failed version compatibility check"))?;
         Ok(azure)
     }
 
     // I don't really understand why this is how we need to get this ip
     // address but this is how it works in the original implementation
     // and nobody complains about it, so w/e
-    fn get_fabric_address() -> Result<IpAddr, String> {
+    fn get_fabric_address() -> Result<IpAddr> {
         // get the interfaces on the machine
         let interfaces = pnet::datalink::interfaces();
         trace!("interfaces - {:?}", interfaces);
@@ -129,13 +131,13 @@ impl Azure {
             if lease_path.exists() {
                 debug!("found lease file - {:?}", lease_path);
                 let lease = File::open(&lease_path)
-                    .map_err(wrap_error!("failed to open lease file ({:?})", lease_path))?;
+                    .chain_err(|| format!("failed to open lease file ({:?})", lease_path))?;
                 let lease = BufReader::new(&lease);
 
                 // find the OPTION_245 flag
                 for line in lease.lines() {
                     let line = line
-                        .map_err(wrap_error!("failed to read from lease file ({:?})", lease_path))?;
+                        .chain_err(|| format!("failed to read from lease file ({:?})", lease_path))?;
                     let option: Vec<&str> = line.split('=').collect();
                     if option.len() > 1 && option[0] == OPTION_245 {
                         // value is an 8 digit hex value. convert it to u32 and
@@ -143,7 +145,7 @@ impl Azure {
                         // performs conversion from big-endian
                         trace!("found fabric address in hex - {:?}", option[1]);
                         let dec = u32::from_str_radix(option[1], 16)
-                            .map_err(wrap_error!("failed to convert '{}' from hex", option[1]))?;
+                            .chain_err(|| format!("failed to convert '{}' from hex", option[1]))?;
                         return Ok(IpAddr::V4(Ipv4Addr::from(dec)));
                     }
                 }
@@ -152,36 +154,36 @@ impl Azure {
             }
         }
 
-        Err(format!("failed to retrieve fabric address"))
+        Err(format!("failed to retrieve fabric address").into())
     }
 
-    fn is_fabric_compatible(&self, version: &str) -> Result<(), String> {
+    fn is_fabric_compatible(&self, version: &str) -> Result<()> {
         let versions: Versions = self.client.get(retry::Xml, format!("http://{}/?comp=versions", self.endpoint)).send()
-            .map_err(wrap_error!("failed to get versions"))?;
+            .chain_err(|| format!("failed to get versions"))?;
 
         if versions.supported.versions.iter().any(|v| v == version) {
             Ok(())
         } else {
-            Err(format!("fabric version {} not compatible with fabric address {}", MS_VERSION, self.endpoint))
+            Err(format!("fabric version {} not compatible with fabric address {}", MS_VERSION, self.endpoint).into())
         }
     }
 
-    fn get_certs_endpoint(&self) -> Result<String, String> {
+    fn get_certs_endpoint(&self) -> Result<String> {
         let goalstate: GoalState = self.client.get(retry::Xml, format!("http://{}/machine/?comp=goalstate", self.endpoint)).send()
-            .map_err(wrap_error!("failed to get goal state"))?;
+            .chain_err(|| format!("failed to get goal state"))?;
 
         // grab the certificates endpoint from the xml and return it
         let cert_endpoint: &str = &goalstate.container.role_instance_list.role_instances[0].configuration.certificates;
         Ok(String::from(cert_endpoint))
     }
 
-    fn get_certs(&self, endpoint: String, mangled_pem: String) -> Result<String, String> {
+    fn get_certs(&self, endpoint: String, mangled_pem: String) -> Result<String> {
         // get the certificates
         let certs: CertificatesFile = self.client.get(retry::Xml, endpoint)
             .header(MSCipherName("DES_EDE3_CBC".to_owned()))
             .header(MSCert(mangled_pem))
             .send()
-            .map_err(wrap_error!("failed to get certificates"))?;
+            .chain_err(|| format!("failed to get certificates"))?;
 
         // the cms decryption expects it to have MIME information on the top
         // since cms is really for email attachments...don't tell the cops.
@@ -192,43 +194,43 @@ impl Azure {
     }
 
     // put it all together
-    fn get_ssh_pubkey(&self) -> Result<String, String> {
+    fn get_ssh_pubkey(&self) -> Result<String> {
         // first we have to get the certificates endoint.
         let certs_endpoint = self.get_certs_endpoint()
-            .map_err(wrap_error!("failed to get certs endpoint"))?;
+            .chain_err(|| format!("failed to get certs endpoint"))?;
 
         // we have to generate the rsa public/private keypair and the x509 cert
         // that we use to make the request. this is equivalent to
         // `openssl req -x509 -nodes -subj /CN=LinuxTransport -days 365 -newkey rsa:2048 -keyout private.pem -out cert.pem`
         let (x509, pkey) = x509::generate_cert(x509::Config::new(2048, 365))
-            .map_err(wrap_error!("failed to generate keys"))?;
+            .chain_err(|| format!("failed to generate keys"))?;
 
         // mangle the pem file for the request
         let mangled_pem = crypto::mangle_pem(&x509)
-            .map_err(wrap_error!("failed to mangle pem"))?;
+            .chain_err(|| format!("failed to mangle pem"))?;
 
         // fetch the encrypted cms blob from the certs endpoint
         let smime = self.get_certs(certs_endpoint, mangled_pem)
-            .map_err(wrap_error!("failed to get certs"))?;
+            .chain_err(|| format!("failed to get certs"))?;
 
         // decrypt the cms blob
         let p12 = crypto::decrypt_cms(smime.as_bytes(), &pkey, &x509)
-            .map_err(wrap_error!("failed to decrypt cms blob"))?;
+            .chain_err(|| format!("failed to decrypt cms blob"))?;
 
         // convert that to the OpenSSH public key format
         let ssh_pubkey = crypto::p12_to_ssh_pubkey(&p12)
-            .map_err(wrap_error!("failed to convert pkcs12 blob to ssh pubkey"))?;
+            .chain_err(|| format!("failed to convert pkcs12 blob to ssh pubkey"))?;
 
         Ok(ssh_pubkey)
     }
 }
 
-pub fn fetch_metadata() -> Result<Metadata, String> {
+pub fn fetch_metadata() -> Result<Metadata> {
     let provider = Azure::new()
-        .map_err(wrap_error!("azure: failed create metadata client"))?;
+        .chain_err(|| format!("azure: failed create metadata client"))?;
 
     let ssh_pubkey = provider.get_ssh_pubkey()
-        .map_err(wrap_error!("azure: failed to get ssh pubkey"))?;
+        .chain_err(|| format!("azure: failed to get ssh pubkey"))?;
 
     Ok(Metadata::builder()
        .add_ssh_key(ssh_pubkey)
diff --git a/src/providers/digitalocean/mod.rs b/src/providers/digitalocean/mod.rs
index 3d99c838..991492cf 100644
--- a/src/providers/digitalocean/mod.rs
+++ b/src/providers/digitalocean/mod.rs
@@ -16,6 +16,8 @@
 
 use metadata::Metadata;
 
-pub fn fetch_metadata() -> Result<Metadata, String> {
+use errors::*;
+
+pub fn fetch_metadata() -> Result<Metadata> {
     unimplemented!();
 }
diff --git a/src/providers/ec2/mod.rs b/src/providers/ec2/mod.rs
index ac6caaf8..be783b79 100644
--- a/src/providers/ec2/mod.rs
+++ b/src/providers/ec2/mod.rs
@@ -16,6 +16,8 @@
 
 use metadata::Metadata;
 
-pub fn fetch_metadata() -> Result<Metadata, String> {
+use errors::*;
+
+pub fn fetch_metadata() -> Result<Metadata> {
     unimplemented!();
 }
diff --git a/src/providers/gce/mod.rs b/src/providers/gce/mod.rs
index df9f038e..ef7d7966 100644
--- a/src/providers/gce/mod.rs
+++ b/src/providers/gce/mod.rs
@@ -16,6 +16,8 @@
 
 use metadata::Metadata;
 
-pub fn fetch_metadata() -> Result<Metadata, String> {
+use errors::*;
+
+pub fn fetch_metadata() -> Result<Metadata> {
     unimplemented!();
 }
diff --git a/src/providers/openstack/mod.rs b/src/providers/openstack/mod.rs
index b40ee02e..a592b8f7 100644
--- a/src/providers/openstack/mod.rs
+++ b/src/providers/openstack/mod.rs
@@ -16,6 +16,8 @@
 
 use metadata::Metadata;
 
-pub fn fetch_metadata() -> Result<Metadata, String> {
+use errors::*;
+
+pub fn fetch_metadata() -> Result<Metadata> {
     unimplemented!();
 }
diff --git a/src/providers/packet/mod.rs b/src/providers/packet/mod.rs
index 4b23933f..e82c2e93 100644
--- a/src/providers/packet/mod.rs
+++ b/src/providers/packet/mod.rs
@@ -16,6 +16,8 @@
 
 use metadata::Metadata;
 
-pub fn fetch_metadata() -> Result<Metadata, String> {
+use errors::*;
+
+pub fn fetch_metadata() -> Result<Metadata> {
     unimplemented!();
 }
diff --git a/src/providers/vagrant_virtualbox/mod.rs b/src/providers/vagrant_virtualbox/mod.rs
index 127a9a64..99c453b8 100644
--- a/src/providers/vagrant_virtualbox/mod.rs
+++ b/src/providers/vagrant_virtualbox/mod.rs
@@ -16,6 +16,8 @@
 
 use metadata::Metadata;
 
-pub fn fetch_metadata() -> Result<Metadata, String> {
+use errors::*;
+
+pub fn fetch_metadata() -> Result<Metadata> {
     unimplemented!();
 }
diff --git a/src/retry/mod.rs b/src/retry/mod.rs
index 4f205296..a97d5c66 100644
--- a/src/retry/mod.rs
+++ b/src/retry/mod.rs
@@ -31,6 +31,8 @@ use reqwest::{Method,Request};
 use serde;
 use serde_xml_rs;
 
+use errors::*;
+
 #[inline(always)]
 pub fn default_initial_backoff() -> Duration { Duration::new(1,0) }
 #[inline(always)]
@@ -39,7 +41,7 @@ pub fn default_max_backoff() -> Duration { Duration::new(5,0) }
 pub fn default_max_attempts() -> u32 { 0 }
 
 pub trait Deserializer {
-    fn deserialize<'de, T>(&self, &str) -> Result<T, String>
+    fn deserialize<'de, T>(&self, &str) -> Result<T>
         where T: serde::Deserialize<'de>;
     fn content_type(&self) -> ContentType;
 }
@@ -48,11 +50,11 @@ pub trait Deserializer {
 pub struct Xml;
 
 impl Deserializer for Xml {
-    fn deserialize<'de, T>(&self, input: &str) -> Result<T, String>
+    fn deserialize<'de, T>(&self, input: &str) -> Result<T>
         where T: serde::Deserialize<'de>
     {
         serde_xml_rs::deserialize(input.as_bytes())
-            .map_err(wrap_error!("failed xml deserialization"))
+            .chain_err(|| format!("failed xml deserialization"))
     }
     fn content_type(&self) -> ContentType {
         ContentType("text/xml; charset=utf-8".parse().unwrap())
@@ -70,9 +72,9 @@ pub struct Client {
 }
 
 impl Client {
-    pub fn new() -> Result<Self,String> {
+    pub fn new() -> Result<Self> {
         let client = reqwest::Client::new()
-            .map_err(wrap_error!("failed to initialize client"))?;
+            .chain_err(|| format!("failed to initialize client"))?;
         Ok(Client{
             client,
             headers: header::Headers::new(),
@@ -157,18 +159,18 @@ impl<D> RequestBuilder<D>
         self
     }
 
-    pub fn send<'de, T>(&self) -> Result<T, String>
+    pub fn send<'de, T>(&self) -> Result<T>
         where T: serde::Deserialize<'de> + 'de
     {
         let url = reqwest::Url::parse(self.url.as_str())
-            .map_err(wrap_error!("failed to parse uri"))?;
+            .chain_err(|| format!("failed to parse uri"))?;
         let mut req = Request::new(Method::Get, url);
         req.headers_mut().extend(self.headers.iter());
         req.headers_mut().set(self.d.content_type());
         self.dispatch_request(req, self.initial_backoff, 0)
     }
 
-    fn dispatch_request<'de, T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T, String>
+    fn dispatch_request<'de, T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T>
         where T: serde::Deserialize<'de> + 'de
     {
         info!("Fetching {}: Attempt#{}", req.url(), num_attempts + 1);
@@ -181,7 +183,7 @@ impl<D> RequestBuilder<D>
                         match resp.read_to_string(&mut buf) {
                             Ok(_) => {
                                 self.d.deserialize(buf.as_str())
-                                    .map_err(wrap_error!("failed to deserialize data"))
+                                    .chain_err(|| format!("failed to deserialize data"))
                             }
                             Err(e) => {
                                 info!("error reading body: {}", e);
@@ -207,7 +209,7 @@ impl<D> RequestBuilder<D>
         }
     }
 
-    fn wait_then_retry<'de, T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T, String>
+    fn wait_then_retry<'de, T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T>
         where T: serde::Deserialize<'de> + 'de
     {
         thread::sleep(delay);
@@ -218,7 +220,7 @@ impl<D> RequestBuilder<D>
             };
         let num_attempts = num_attempts + 1;
         if self.max_attempts != 0 && num_attempts == self.max_attempts {
-            Err(format!("Timed out while fetching {}", req.url()))
+            Err(format!("Timed out while fetching {}", req.url()).into())
         } else {
             self.dispatch_request(req, delay, num_attempts)
         }
diff --git a/src/ssh.rs b/src/ssh.rs
index f8a204a5..10657f4a 100644
--- a/src/ssh.rs
+++ b/src/ssh.rs
@@ -26,7 +26,9 @@ use std::io::prelude::*;
 use users::os::unix::UserExt;
 use users;
 
-pub fn create_authorized_keys_dir(user: users::User) -> Result<PathBuf, String> {
+use errors::*;
+
+pub fn create_authorized_keys_dir(user: users::User) -> Result<PathBuf> {
     // construct the path to the authorized keys directory
     let ssh_dir = user.home_dir().join(".ssh");
     let authorized_keys_dir = ssh_dir.join("authorized_keys.d");
@@ -37,44 +39,44 @@ pub fn create_authorized_keys_dir(user: users::User) -> Result<PathBuf, String>
     }
     // if it doesn't, create it
     fs::create_dir_all(&authorized_keys_dir)
-        .map_err(wrap_error!("failed to create directory {:?}", authorized_keys_dir))?;
+        .chain_err(|| format!("failed to create directory {:?}", authorized_keys_dir))?;
     // check if there is an authorized keys file
     let authorized_keys_file = ssh_dir.join("authorized_keys");
     if authorized_keys_file.is_file() {
         // if there is, copy it into the authorized keys directory
         let preserved_keys_file = authorized_keys_dir.join("orig_authorzied_keys");
         fs::copy(&authorized_keys_file, preserved_keys_file)
-            .map_err(wrap_error!("failed to copy old authorzied keys file"))?;
+            .chain_err(|| format!("failed to copy old authorzied keys file"))?;
     }
     // then we are done
     Ok(authorized_keys_dir)
 }
 
-pub fn sync_authorized_keys(authorized_keys_dir: PathBuf) -> Result<(), String> {
+pub fn sync_authorized_keys(authorized_keys_dir: PathBuf) -> Result<()> {
     let ssh_dir = authorized_keys_dir.parent()
         .ok_or(format!("could not get parent directory of {:?}", authorized_keys_dir))?;
     let mut authorized_keys_file = File::create(ssh_dir.join("authorized_keys"))
-        .map_err(wrap_error!("failed to create file {:?}", ssh_dir.join("authorized_keys")))?;
+        .chain_err(|| format!("failed to create file {:?}", ssh_dir.join("authorized_keys")))?;
     flatten_dir(&mut authorized_keys_file, &authorized_keys_dir)
 }
 
-fn flatten_dir(mut file: &mut File, dir: &PathBuf) -> Result<(), String> {
+fn flatten_dir(mut file: &mut File, dir: &PathBuf) -> Result<()> {
     let dir_contents = fs::read_dir(&dir)
-        .map_err(wrap_error!("failed to read from directory {:?}", dir))?;
+        .chain_err(|| format!("failed to read from directory {:?}", dir))?;
     for entry in dir_contents {
-        let entry = entry.map_err(wrap_error!("failed to read entry in directory {:?}", dir))?;
+        let entry = entry.chain_err(|| format!("failed to read entry in directory {:?}", dir))?;
         let path = entry.path();
         if path.is_dir() {
             // if it's a directory, recurse into it
             flatten_dir(&mut file, &path)?;
         } else {
             let mut from = File::open(&path)
-                .map_err(wrap_error!("failed to open file {:?}", path))?;
+                .chain_err(|| format!("failed to open file {:?}", path))?;
             let mut contents = String::new();
             from.read_to_string(&mut contents)
-                .map_err(wrap_error!("failed to read file {:?}", path))?;
+                .chain_err(|| format!("failed to read file {:?}", path))?;
             write!(&mut file, "{}\n", contents)
-                .map_err(wrap_error!("failed to write to file {:?}", file))?;
+                .chain_err(|| format!("failed to write to file {:?}", file))?;
         }
     }
     Ok(())

From b24c6d93949aa0c9c5dfdfdc1f55534c40526d5f Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Thu, 24 Aug 2017 10:57:09 -0700
Subject: [PATCH 25/71] lib: allow unused doc comments in errors mod

this is a bug in the current version of error-chain, and will hopefully
be fixed in the future
---
 src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib.rs b/src/lib.rs
index 00a9fc37..4c2f39f4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -44,6 +44,7 @@ mod ssh;
 mod network;
 mod retry;
 
+#[allow(unused_doc_comment)]
 pub mod errors {
     error_chain!{
         foreign_links {

From 4b217bd71bc01a79dd01e1d89f4c998cfa5ed4a3 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 23 Aug 2017 15:54:14 -0700
Subject: [PATCH 26/71] src/retry: add raw deserializer

this allows the retry logic to work with services which don't return
structured data, while still providing automatic deserialization for
those who do.
---
 Cargo.lock                    |   1 +
 Cargo.toml                    |   1 +
 src/lib.rs                    |   1 +
 src/retry/mod.rs              |  72 +++++++----
 src/retry/raw_deserializer.rs | 233 ++++++++++++++++++++++++++++++++++
 5 files changed, 283 insertions(+), 25 deletions(-)
 create mode 100644 src/retry/raw_deserializer.rs

diff --git a/Cargo.lock b/Cargo.lock
index d61db83d..ef494fb3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,6 +14,7 @@ dependencies = [
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-xml-rs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 79248386..41f4ff19 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,6 +13,7 @@ mime = "0.3"
 serde = "1.0"
 serde_derive = "1.0"
 serde-xml-rs = "0.2"
+serde_json = "1.0"
 openssl = "0.9.17"
 base64 = "0.6"
 byteorder = "1.1"
diff --git a/src/lib.rs b/src/lib.rs
index 4c2f39f4..e09cf49f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -31,6 +31,7 @@ extern crate slog_scope;
 extern crate serde_derive;
 extern crate serde;
 extern crate serde_xml_rs;
+extern crate serde_json;
 
 extern crate pnet;
 
diff --git a/src/retry/mod.rs b/src/retry/mod.rs
index a97d5c66..6b757710 100644
--- a/src/retry/mod.rs
+++ b/src/retry/mod.rs
@@ -30,6 +30,9 @@ use reqwest::{Method,Request};
 
 use serde;
 use serde_xml_rs;
+use serde_json;
+
+mod raw_deserializer;
 
 use errors::*;
 
@@ -41,8 +44,8 @@ pub fn default_max_backoff() -> Duration { Duration::new(5,0) }
 pub fn default_max_attempts() -> u32 { 0 }
 
 pub trait Deserializer {
-    fn deserialize<'de, T>(&self, &str) -> Result<T>
-        where T: serde::Deserialize<'de>;
+    fn deserialize<T, R>(&self, R) -> Result<T>
+        where T: for<'de> serde::Deserialize<'de>, R: Read;
     fn content_type(&self) -> ContentType;
 }
 
@@ -50,10 +53,10 @@ pub trait Deserializer {
 pub struct Xml;
 
 impl Deserializer for Xml {
-    fn deserialize<'de, T>(&self, input: &str) -> Result<T>
-        where T: serde::Deserialize<'de>
+    fn deserialize<T, R>(&self, r: R) -> Result<T>
+        where T: for<'de> serde::Deserialize<'de>, R: Read
     {
-        serde_xml_rs::deserialize(input.as_bytes())
+        serde_xml_rs::deserialize(r)
             .chain_err(|| format!("failed xml deserialization"))
     }
     fn content_type(&self) -> ContentType {
@@ -61,6 +64,36 @@ impl Deserializer for Xml {
     }
 }
 
+#[derive(Debug, Clone, Copy)]
+pub struct Json;
+
+impl Deserializer for Json {
+    fn deserialize<T, R>(&self, r: R) -> Result<T>
+        where T: serde::de::DeserializeOwned, R: Read
+    {
+        serde_json::from_reader(r)
+            .chain_err(|| format!("failed json deserialization"))
+    }
+    fn content_type(&self) -> ContentType {
+        ContentType("text/json; charset=utf-8".parse().unwrap())
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct Raw;
+
+impl Deserializer for Raw {
+    fn deserialize<T, R>(&self, r: R) -> Result<T>
+        where T: for<'de> serde::Deserialize<'de>, R: Read
+    {
+        raw_deserializer::from_reader(r)
+            .chain_err(|| format!("failed raw deserialization"))
+    }
+    fn content_type(&self) -> ContentType {
+        ContentType("text/plain; charset=utf-8".parse().unwrap())
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct Client {
     client: reqwest::Client,
@@ -159,8 +192,8 @@ impl<D> RequestBuilder<D>
         self
     }
 
-    pub fn send<'de, T>(&self) -> Result<T>
-        where T: serde::Deserialize<'de> + 'de
+    pub fn send<T>(&self) -> Result<T>
+        where T: for<'de> serde::Deserialize<'de>
     {
         let url = reqwest::Url::parse(self.url.as_str())
             .chain_err(|| format!("failed to parse uri"))?;
@@ -170,27 +203,16 @@ impl<D> RequestBuilder<D>
         self.dispatch_request(req, self.initial_backoff, 0)
     }
 
-    fn dispatch_request<'de, T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T>
-        where T: serde::Deserialize<'de> + 'de
+    fn dispatch_request<T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T>
+        where T: for<'de> serde::Deserialize<'de>
     {
         info!("Fetching {}: Attempt#{}", req.url(), num_attempts + 1);
 
         match self.client.execute(clone_request(&req)) {
-            Ok(mut resp) => {
+            Ok(resp) => {
                 match (resp.status(), self.return_on_404) {
-                    (reqwest::StatusCode::Ok,_) => {
-                        let mut buf = String::new();
-                        match resp.read_to_string(&mut buf) {
-                            Ok(_) => {
-                                self.d.deserialize(buf.as_str())
-                                    .chain_err(|| format!("failed to deserialize data"))
-                            }
-                            Err(e) => {
-                                info!("error reading body: {}", e);
-                                self.wait_then_retry(req, delay, num_attempts)
-                            }
-                        }
-                    }
+                    (reqwest::StatusCode::Ok,_) => self.d.deserialize(resp)
+                        .chain_err(|| format!("failed to deserialize data")),
                     (reqwest::StatusCode::NotFound,true) => {
                         // TODO: return empty (failed?)
                         error!("Failed to fetch: should return!");
@@ -209,8 +231,8 @@ impl<D> RequestBuilder<D>
         }
     }
 
-    fn wait_then_retry<'de, T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T>
-        where T: serde::Deserialize<'de> + 'de
+    fn wait_then_retry<T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T>
+        where T: for<'de> serde::Deserialize<'de>
     {
         thread::sleep(delay);
         let delay = if self.max_backoff != Duration::new(0,0) && delay * 2 > self.max_backoff {
diff --git a/src/retry/raw_deserializer.rs b/src/retry/raw_deserializer.rs
new file mode 100644
index 00000000..8656cba7
--- /dev/null
+++ b/src/retry/raw_deserializer.rs
@@ -0,0 +1,233 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::io::Read;
+
+use std::result;
+
+use serde::de::{self,Visitor,DeserializeOwned};
+
+use errors::*;
+
+pub struct RawDeserializer
+{
+    s: String,
+}
+
+impl RawDeserializer
+{
+    pub fn from_reader<R>(mut r: R) -> Result<Self>
+        where R: Read
+    {
+        let mut s = String::new();
+        r.read_to_string(&mut s)
+            .chain_err(|| format!("error reading"))?;
+        Ok(RawDeserializer { s })
+    }
+}
+
+pub fn from_reader<T, R>(r: R) -> Result<T>
+    where T: DeserializeOwned, R: Read
+{
+    let mut deserializer = RawDeserializer::from_reader(r)?;
+    Ok(T::deserialize(&mut deserializer)
+       .chain_err(|| format!("error deserializing"))?)
+}
+
+impl<'de, 'a> de::Deserializer<'de> for &'a mut RawDeserializer {
+    type Error = de::value::Error;
+
+    fn deserialize_any<V>(self, visitor: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        self.deserialize_string(visitor)
+    }
+
+    fn deserialize_bool<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_i8<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_i16<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_i32<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_i64<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_u8<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_u16<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_u32<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_u64<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_f32<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_f64<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_char<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_str<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_string<V>(self, visitor: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        visitor.visit_string(self.s.clone())
+    }
+    fn deserialize_bytes<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_byte_buf<V>(
+        self,
+        _: V
+    ) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_option<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_unit<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_unit_struct<V>(
+        self,
+        _: &'static str,
+        _: V
+    ) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_newtype_struct<V>(
+        self,
+        _: &'static str,
+        _: V
+    ) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_seq<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_tuple<V>(
+        self,
+        _: usize,
+        _: V
+    ) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_tuple_struct<V>(
+        self,
+        _: &'static str,
+        _: usize,
+        _: V
+    ) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_map<V>(self, _: V) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_struct<V>(
+        self,
+        _: &'static str,
+        _: &'static [&'static str],
+        _: V
+    ) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_enum<V>(
+        self,
+        _: &'static str,
+        _: &'static [&'static str],
+        _: V
+    ) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_identifier<V>(
+        self,
+        _: V
+    ) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+    fn deserialize_ignored_any<V>(
+        self,
+        _: V
+    ) -> result::Result<V::Value, Self::Error>
+        where V: Visitor<'de>
+    {
+        unimplemented!()
+    }
+}

From d95013dd6dd28a9be3e3d2e1ab4512be74df77ae Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 23 Aug 2017 16:44:19 -0700
Subject: [PATCH 27/71] retry: fixed issue where retry recursed forever

if a client used the default max attempts amount, the retry logic would
recurse infinitely.
---
 src/retry/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/retry/mod.rs b/src/retry/mod.rs
index 6b757710..f20452e3 100644
--- a/src/retry/mod.rs
+++ b/src/retry/mod.rs
@@ -41,7 +41,7 @@ pub fn default_initial_backoff() -> Duration { Duration::new(1,0) }
 #[inline(always)]
 pub fn default_max_backoff() -> Duration { Duration::new(5,0) }
 #[inline(always)]
-pub fn default_max_attempts() -> u32 { 0 }
+pub fn default_max_attempts() -> u32 { 10 }
 
 pub trait Deserializer {
     fn deserialize<T, R>(&self, R) -> Result<T>
@@ -241,8 +241,8 @@ impl<D> RequestBuilder<D>
                 delay * 2
             };
         let num_attempts = num_attempts + 1;
-        if self.max_attempts != 0 && num_attempts == self.max_attempts {
-            Err(format!("Timed out while fetching {}", req.url()).into())
+        if num_attempts == self.max_attempts {
+            Err(format!("Timed out while fetching {}", req.url()))
         } else {
             self.dispatch_request(req, delay, num_attempts)
         }

From f4fd77dbe2988e14695d675bb983596276b5db93 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 23 Aug 2017 16:44:56 -0700
Subject: [PATCH 28/71] retry: can return empty results

If return_on_404 is set to true, now Some(None) will be returned if a
404 is encountered, Some(T) is returned if a 200 is encountered (and
successfully deserialized), and an Err is returned otherwise.
---
 src/metadata.rs            | 14 ++++++++++++++
 src/providers/azure/mod.rs |  9 ++++++---
 src/retry/mod.rs           | 21 ++++++++++++---------
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/metadata.rs b/src/metadata.rs
index d8fa55e1..79a1cf79 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -59,11 +59,25 @@ impl MetadataBuilder {
         self
     }
 
+    pub fn add_attribute_if_exists(mut self, key: String, value: Option<String>) -> Self {
+        match value {
+            Some(v) => self.add_attribute(key, v),
+            None => self
+        }
+    }
+
     pub fn set_hostname(mut self, hostname: String) -> Self {
         self.metadata.hostname = Some(hostname);
         self
     }
 
+    pub fn set_hostname_if_exists(mut self, hostname: Option<String>) -> Self {
+        match hostname {
+            Some(v) => self.set_hostname(v),
+            None => self
+        }
+    }
+
     pub fn add_ssh_key(mut self, ssh_key: String) -> Self {
         self.metadata.ssh_keys.push(ssh_key);
         self
diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index abe064bb..826620ea 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -159,7 +159,8 @@ impl Azure {
 
     fn is_fabric_compatible(&self, version: &str) -> Result<()> {
         let versions: Versions = self.client.get(retry::Xml, format!("http://{}/?comp=versions", self.endpoint)).send()
-            .chain_err(|| format!("failed to get versions"))?;
+            .chain_err(|| format!("failed to get versions"))?
+            .ok_or("failed to get versions: not found".to_owned())?;
 
         if versions.supported.versions.iter().any(|v| v == version) {
             Ok(())
@@ -170,7 +171,8 @@ impl Azure {
 
     fn get_certs_endpoint(&self) -> Result<String> {
         let goalstate: GoalState = self.client.get(retry::Xml, format!("http://{}/machine/?comp=goalstate", self.endpoint)).send()
-            .chain_err(|| format!("failed to get goal state"))?;
+            .chain_err(|| format!("failed to get goal state"))?
+            .ok_or("failed to get goal state: not found response".to_owned())?;
 
         // grab the certificates endpoint from the xml and return it
         let cert_endpoint: &str = &goalstate.container.role_instance_list.role_instances[0].configuration.certificates;
@@ -183,7 +185,8 @@ impl Azure {
             .header(MSCipherName("DES_EDE3_CBC".to_owned()))
             .header(MSCert(mangled_pem))
             .send()
-            .chain_err(|| format!("failed to get certificates"))?;
+            .chain_err(|| format!("failed to get certificates"))?
+            .ok_or("failed to get certificates: not found".to_owned())?;
 
         // the cms decryption expects it to have MIME information on the top
         // since cms is really for email attachments...don't tell the cops.
diff --git a/src/retry/mod.rs b/src/retry/mod.rs
index f20452e3..bca97c79 100644
--- a/src/retry/mod.rs
+++ b/src/retry/mod.rs
@@ -192,7 +192,7 @@ impl<D> RequestBuilder<D>
         self
     }
 
-    pub fn send<T>(&self) -> Result<T>
+    pub fn send<T>(&self) -> Result<Option<T>>
         where T: for<'de> serde::Deserialize<'de>
     {
         let url = reqwest::Url::parse(self.url.as_str())
@@ -203,7 +203,7 @@ impl<D> RequestBuilder<D>
         self.dispatch_request(req, self.initial_backoff, 0)
     }
 
-    fn dispatch_request<T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T>
+    fn dispatch_request<T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<Option<T>>
         where T: for<'de> serde::Deserialize<'de>
     {
         info!("Fetching {}: Attempt#{}", req.url(), num_attempts + 1);
@@ -211,12 +211,15 @@ impl<D> RequestBuilder<D>
         match self.client.execute(clone_request(&req)) {
             Ok(resp) => {
                 match (resp.status(), self.return_on_404) {
-                    (reqwest::StatusCode::Ok,_) => self.d.deserialize(resp)
-                        .chain_err(|| format!("failed to deserialize data")),
+                    (reqwest::StatusCode::Ok,_) => {
+                        info!("Fetch successful");
+                        self.d.deserialize(resp)
+                            .map(|x| Some(x))
+                            .chain_err(|| format!("failed to deserialize data"))
+                    }
                     (reqwest::StatusCode::NotFound,true) => {
-                        // TODO: return empty (failed?)
-                        error!("Failed to fetch: should return!");
-                        self.wait_then_retry(req, delay, num_attempts)
+                        info!("Fetch failed with 404: resource not found");
+                        Ok(None)
                     }
                     (s,_) => {
                         info!("Failed to fetch: {}", s);
@@ -231,7 +234,7 @@ impl<D> RequestBuilder<D>
         }
     }
 
-    fn wait_then_retry<T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<T>
+    fn wait_then_retry<T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<Option<T>>
         where T: for<'de> serde::Deserialize<'de>
     {
         thread::sleep(delay);
@@ -242,7 +245,7 @@ impl<D> RequestBuilder<D>
             };
         let num_attempts = num_attempts + 1;
         if num_attempts == self.max_attempts {
-            Err(format!("Timed out while fetching {}", req.url()))
+            Err(format!("Timed out while fetching {}", req.url()).into())
         } else {
             self.dispatch_request(req, delay, num_attempts)
         }

From 847339828f4a3d6b090a9af53fa1ec3737f2d2e3 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 23 Aug 2017 16:46:20 -0700
Subject: [PATCH 29/71] providers/ec2: initial implementation

this implementation gets attributes from the ec2 metadata service. it
also fixes some mutability warnings with the metadata builder.
---
 src/metadata.rs          |  4 ++--
 src/providers/ec2/mod.rs | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/metadata.rs b/src/metadata.rs
index 79a1cf79..0334c832 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -59,7 +59,7 @@ impl MetadataBuilder {
         self
     }
 
-    pub fn add_attribute_if_exists(mut self, key: String, value: Option<String>) -> Self {
+    pub fn add_attribute_if_exists(self, key: String, value: Option<String>) -> Self {
         match value {
             Some(v) => self.add_attribute(key, v),
             None => self
@@ -71,7 +71,7 @@ impl MetadataBuilder {
         self
     }
 
-    pub fn set_hostname_if_exists(mut self, hostname: Option<String>) -> Self {
+    pub fn set_hostname_if_exists(self, hostname: Option<String>) -> Self {
         match hostname {
             Some(v) => self.set_hostname(v),
             None => self
diff --git a/src/providers/ec2/mod.rs b/src/providers/ec2/mod.rs
index be783b79..636b5dbe 100644
--- a/src/providers/ec2/mod.rs
+++ b/src/providers/ec2/mod.rs
@@ -13,11 +13,43 @@
 // limitations under the License.
 
 //! aws ec2 metadata fetcher
+//!
+use retry;
 
 use metadata::Metadata;
 
 use errors::*;
 
+fn url_for_key(key: &str) -> String {
+    format!("http://169.254.169.254/2009-04-04/{}", key)
+}
+
+#[allow(non_snake_case)]
+#[derive(Debug, Deserialize)]
+struct InstanceIdDoc {
+    region: String,
+}
+
 pub fn fetch_metadata() -> Result<Metadata> {
-    unimplemented!();
+    let client = retry::Client::new()
+        .chain_err(|| format!("ec2: failed to create http client"))?
+        .return_on_404(true);
+
+    let instance_id: Option<String> = client.get(retry::Raw, url_for_key("meta-data/instance-id")).send()?;
+    let public: Option<String> = client.get(retry::Raw, url_for_key("meta-data/public-ipv4")).send()?;
+    let local: Option<String> = client.get(retry::Raw, url_for_key("meta-data/local-ipv4")).send()?;
+    let hostname: Option<String> = client.get(retry::Raw, url_for_key("meta-data/hostname")).send()?;
+    let availability_zone: Option<String> = client.get(retry::Raw, url_for_key("meta-data/placement/availability-zone")).send()?;
+    let region: Option<String> = client.get(retry::Json, url_for_key("dynamic/instance-identity/document")).send()?
+        .map(|instance_id_doc: InstanceIdDoc| instance_id_doc.region);
+
+    Ok(Metadata::builder()
+        .add_attribute_if_exists("EC2_REGION".to_owned(), region)
+        .add_attribute_if_exists("EC2_INSTANCE_ID".to_owned(), instance_id)
+        .add_attribute_if_exists("EC2_IPV4_PUBLIC".to_owned(), public)
+        .add_attribute_if_exists("EC2_IPV4_LOCAL".to_owned(), local)
+        .add_attribute_if_exists("EC2_HOSTNAME".to_owned(), hostname.clone())
+        .add_attribute_if_exists("EC2_AVAILABILITY_ZONE".to_owned(), availability_zone)
+        .set_hostname_if_exists(hostname)
+        .build())
 }

From 9ee13f2f9f0bf40460515ecf58686bc3ba04191e Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 23 Aug 2017 17:13:47 -0700
Subject: [PATCH 30/71] metadata: change add_ssh_key to take vector

this makes working with the builder easier for providers that give
coreos-metadata multiple ssh public keys (ie most of them)
---
 src/metadata.rs            | 4 ++--
 src/providers/azure/mod.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/metadata.rs b/src/metadata.rs
index 0334c832..f7420675 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -78,8 +78,8 @@ impl MetadataBuilder {
         }
     }
 
-    pub fn add_ssh_key(mut self, ssh_key: String) -> Self {
-        self.metadata.ssh_keys.push(ssh_key);
+    pub fn add_ssh_keys(mut self, mut ssh_keys: Vec<String>) -> Self {
+        self.metadata.ssh_keys.append(&mut ssh_keys);
         self
     }
 
diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index 826620ea..9652fa90 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -236,6 +236,6 @@ pub fn fetch_metadata() -> Result<Metadata> {
         .chain_err(|| format!("azure: failed to get ssh pubkey"))?;
 
     Ok(Metadata::builder()
-       .add_ssh_key(ssh_pubkey)
+       .add_ssh_keys(vec![ssh_pubkey])
        .build())
 }

From 749b8b85789f6e1e7eb16aea42ca2d658c2561db Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 23 Aug 2017 17:14:13 -0700
Subject: [PATCH 31/71] providers/ec2: add ssh keys implementation

this gets ssh public keys from the ec2 metadata service
---
 src/providers/ec2/mod.rs | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/providers/ec2/mod.rs b/src/providers/ec2/mod.rs
index 636b5dbe..7487179d 100644
--- a/src/providers/ec2/mod.rs
+++ b/src/providers/ec2/mod.rs
@@ -43,6 +43,8 @@ pub fn fetch_metadata() -> Result<Metadata> {
     let region: Option<String> = client.get(retry::Json, url_for_key("dynamic/instance-identity/document")).send()?
         .map(|instance_id_doc: InstanceIdDoc| instance_id_doc.region);
 
+    let mut ssh_keys: Vec<String> = fetch_ssh_keys(client)?;
+
     Ok(Metadata::builder()
         .add_attribute_if_exists("EC2_REGION".to_owned(), region)
         .add_attribute_if_exists("EC2_INSTANCE_ID".to_owned(), instance_id)
@@ -51,5 +53,32 @@ pub fn fetch_metadata() -> Result<Metadata> {
         .add_attribute_if_exists("EC2_HOSTNAME".to_owned(), hostname.clone())
         .add_attribute_if_exists("EC2_AVAILABILITY_ZONE".to_owned(), availability_zone)
         .set_hostname_if_exists(hostname)
+        .add_ssh_keys(ssh_keys)
         .build())
 }
+
+fn fetch_ssh_keys(client: retry::Client) -> Result<Vec<String>> {
+    let keydata: Option<String> = client.get(retry::Raw, url_for_key("meta-data/public-keys")).send()?;
+    match keydata {
+        Some(s) => {
+            let mut res = Ok(Vec::new());
+            for keyname in s.split_whitespace() {
+                let tokens: Vec<&str> = keyname.split('=').collect();
+                if tokens.len() != 2 {
+                    res = Err("malformed public key".into());
+                    break;
+                }
+                let ssh_key: String = client.get(retry::Raw, url_for_key(&format!("meta-data/public-keys/{}/openssh-key", tokens[0]))).send()?
+                    .ok_or("missing ssh key")?;
+                match res.as_mut() {
+                    Ok(keys) => (*keys).push(ssh_key),
+                    Err(_) => (),
+                }
+            }
+            res
+        }
+        None => {
+            Ok(Vec::new())
+        }
+    }
+}

From ae0e8596e3e4e755f570697789a313193e3c5dc4 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 25 Aug 2017 17:24:53 -0700
Subject: [PATCH 32/71] azure: move to an ssh-keys handling library

this library needs to be more powerful than the current implementation,
and is useful to more than just this library in general.
---
 Cargo.lock                        |  13 ++++
 Cargo.toml                        |   1 +
 src/lib.rs                        |   1 +
 src/providers/azure/crypto/mod.rs |  10 ++-
 src/providers/azure/crypto/ssh.rs | 101 ------------------------------
 5 files changed, 19 insertions(+), 107 deletions(-)
 delete mode 100644 src/providers/azure/crypto/ssh.rs

diff --git a/Cargo.lock b/Cargo.lock
index ef494fb3..3df685be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,6 +19,7 @@ dependencies = [
  "slog-async 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-term 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ssh-keys 0.1.0 (git+https://github.com/sdemos/ssh-keys)",
  "users 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -798,6 +799,17 @@ name = "smallvec"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ssh-keys"
+version = "0.1.0"
+source = "git+https://github.com/sdemos/ssh-keys#1558a1d08e5f0d5fd2d50cc7bc8e03c38c1dda4f"
+dependencies = [
+ "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "strsim"
 version = "0.6.0"
@@ -1202,6 +1214,7 @@ dependencies = [
 "checksum slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd3236e1818c147ed3003930289dc6457425aaca3a7dbb6b7f3032f075d865c5"
 "checksum slog-term 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8734c9ff9a45be6026599e15aad5c29c2beb35113488b6945391853a011690"
 "checksum smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013"
+"checksum ssh-keys 0.1.0 (git+https://github.com/sdemos/ssh-keys)" = "<none>"
 "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
diff --git a/Cargo.toml b/Cargo.toml
index 41f4ff19..290ac92d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,6 +21,7 @@ pnet = "0.19"
 reqwest = "0.7"
 hyper = "0.11"
 error-chain = "0.10"
+ssh-keys = { git = "https://github.com/sdemos/ssh-keys" }
 
 [dependencies.slog]
 version = "*"
diff --git a/src/lib.rs b/src/lib.rs
index e09cf49f..112d1007 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -36,6 +36,7 @@ extern crate serde_json;
 extern crate pnet;
 
 extern crate openssl;
+extern crate ssh_keys;
 
 extern crate users;
 
diff --git a/src/providers/azure/crypto/mod.rs b/src/providers/azure/crypto/mod.rs
index 30fe0704..bf5f1c03 100644
--- a/src/providers/azure/crypto/mod.rs
+++ b/src/providers/azure/crypto/mod.rs
@@ -15,13 +15,14 @@
 //! crypto module takes care of cryptographic functions
 
 pub mod x509;
-pub mod ssh;
 
 use openssl::x509::X509;
 use openssl::pkey::PKey;
 use openssl::cms::CmsContentInfo;
 use openssl::pkcs12::Pkcs12;
 
+use ssh_keys;
+
 use errors::*;
 
 pub fn mangle_pem(x509: &X509) -> Result<String> {
@@ -69,11 +70,8 @@ pub fn p12_to_ssh_pubkey(p12_der: &[u8]) -> Result<String> {
     let ssh_pubkey_pem = ssh_pubkey_pem.rsa()        // get the rsa contents from the pkey struct
         .chain_err(|| format!("failed to get rsa contents from pkey"))?;
 
-    // so now I have a pkey struct which represents my rsa public key. This is
-    // my ssh public key. However, I can only export it in pem or der. Ther are
-    // no existing rust (or go for that matter) libraries which do the
-    // conversion I want, so I guess I'll have to write my own function to do it
-    let ssh_pubkey = ssh::rsa_to_ssh(&ssh_pubkey_pem, "");
+    // convert the openssl Rsa public key to an OpenSSH public key in string format
+    let ssh_pubkey = ssh_keys::PublicKey::from_rsa(&ssh_pubkey_pem).to_string("");
 
     Ok(ssh_pubkey)
 }
diff --git a/src/providers/azure/crypto/ssh.rs b/src/providers/azure/crypto/ssh.rs
deleted file mode 100644
index b12cea74..00000000
--- a/src/providers/azure/crypto/ssh.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2017 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! OpenSSH Public Keys
-//!
-//! This crate converts to and from OpenSSH Public Keys. Right now, there is
-//! just decoding from generic RSA to OpenSSH Public Key format.
-//!
-//! To use this library:
-//!
-//! ```
-//! extern crate openssl;
-//! extern crate ssh;
-//!
-//! use openssl::rsa::Rsa;
-//!
-//! let rsa = Rsa::generate(2048).unwrap();
-//! let ssh_pubkey = ssh::rsa_to_ssh(rsa, "user@host");
-//! println!("my ssh public key: {}", ssh_pubkey);
-//! ```
-
-use base64;
-
-use byteorder::{WriteBytesExt, BigEndian};
-
-use openssl::rsa::Rsa;
-use openssl::bn;
-
-// an ssh key consists of three pieces:
-//    ssh-keytype data comment
-// our ssh-keytype is ssh-rsa.
-// the data also consists of three pieces (for an rsa key):
-//    ssh-rsa public-exponent modulus
-// each of those is encoded as big-endian bytes preceeded by four bytes
-// representing their length.
-// for details:
-// see ssh-rsa format in https://tools.ietf.org/html/rfc4253#section-6.6
-pub fn rsa_to_ssh(rsa: &Rsa, comment: &str) -> String {
-    // first it has the keytype
-    let keytype = "ssh-rsa";
-    let mut key = encode_ssh(keytype.as_bytes().to_vec());
-
-    // then it has the encoded public exponent
-    let e = rsa.e().unwrap();
-    key.append(&mut encode_mpint(e));
-
-    // last it has the endcoded modulus
-    let n = rsa.n().unwrap();
-    key.append(&mut encode_mpint(n));
-
-    // the data section is base64 encoded
-    let data = base64::encode(&key);
-
-    format!("{} {} {}", keytype, data, comment)
-}
-
-// according to RFC 4251, the mpint datatype representation is a big-endian
-// arbitrary-precision integer stored in two's compliment and stored as a
-// string with the minimum possible number of characters.
-// see mpint definition in https://tools.ietf.org/html/rfc4251#section-5
-fn encode_mpint(num: &bn::BigNumRef) -> Vec<u8> {
-    // bignum.to_vec() gives big-endian results
-    let mut buf = num.to_vec();
-
-    // If the number is positive (which ours are going to be because of the rsa
-    // spec), then we are required to guarentee that the most significant bit is
-    // set to zero if the first bit in the first byte is going to be one.
-    if buf.get(0).unwrap() & 0x80 != 0 {
-        buf.insert(0, 0);
-    }
-
-    // other than that it's just normal ssh encoding
-    encode_ssh(buf)
-}
-
-// a datatype in ssh is encoded as 4 bytes representing the size, followed by
-// the data itself, all in big-endian. Since we don't really the endian-ness of
-// the provided Vec<u8>, we just assume it's correct and worry about the length.
-fn encode_ssh(mut buf: Vec<u8>) -> Vec<u8> {
-    let mut encoded: Vec<u8> = Vec::new();
-
-    // The first four bytes represent the length of the encoded data.
-    // BigEndian::write_u32(&mut encoded, buf.len() as u32);
-    encoded.write_u32::<BigEndian>(buf.len() as u32).unwrap();
-
-    // the rest of the bytes are the data itself
-    encoded.append(&mut buf);
-
-    encoded
-}

From b69bf73d0e250af08d2f705bee0d466a4a9fabc8 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Mon, 28 Aug 2017 18:23:57 -0700
Subject: [PATCH 33/71] cargo: updated dependencies to newest version

in particular, update to the newest ssh-keys library version, but also
update the other dependencies.
---
 Cargo.lock                        | 171 ++++++++++++++++--------------
 src/providers/azure/crypto/mod.rs |   4 +-
 2 files changed, 95 insertions(+), 80 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3df685be..5e135038 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,7 +4,7 @@ version = "0.1.0"
 dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -12,15 +12,15 @@ dependencies = [
  "pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde-xml-rs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde-xml-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog-async 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-async 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog-term 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-term 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ssh-keys 0.1.0 (git+https://github.com/sdemos/ssh-keys)",
- "users 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -56,7 +56,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -69,7 +69,7 @@ dependencies = [
  "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -79,8 +79,8 @@ name = "backtrace-sys"
 version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -137,7 +137,7 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.25.0"
+version = "2.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -145,8 +145,8 @@ dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -165,7 +165,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -173,7 +173,7 @@ name = "core-foundation-sys"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -206,7 +206,7 @@ dependencies = [
 
 [[package]]
 name = "dtoa"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -224,7 +224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "futures"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -232,13 +232,13 @@ name = "futures-cpupool"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "gcc"
-version = "0.3.51"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -258,7 +258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -278,7 +278,7 @@ name = "hyper-tls"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -302,7 +302,7 @@ name = "iovec"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -317,13 +317,13 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -352,7 +352,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.26"
+version = "0.2.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -396,7 +396,7 @@ name = "memchr"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -415,7 +415,7 @@ dependencies = [
  "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -455,7 +455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -497,7 +497,7 @@ name = "num_cpus"
 version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -508,7 +508,7 @@ dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -517,8 +517,8 @@ name = "openssl-sys"
 version = "0.9.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -540,7 +540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet_macros_support 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -573,13 +573,13 @@ name = "rand"
 version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.26"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -605,7 +605,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -620,6 +620,18 @@ dependencies = [
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rust-crypto"
+version = "0.2.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.5"
@@ -678,7 +690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -688,7 +700,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -703,7 +715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde-xml-rs"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -735,8 +747,8 @@ name = "serde_json"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -746,8 +758,8 @@ name = "serde_urlencoded"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -759,15 +771,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "slog"
-version = "2.0.6"
+version = "2.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "slog-async"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "take_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -779,17 +791,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "slog-term"
-version = "2.0.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -802,12 +814,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "ssh-keys"
 version = "0.1.0"
-source = "git+https://github.com/sdemos/ssh-keys#1558a1d08e5f0d5fd2d50cc7bc8e03c38c1dda4f"
+source = "git+https://github.com/sdemos/ssh-keys#4ca84db2615502004d0dc2fdb706ec24eceec885"
 dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -847,7 +859,7 @@ name = "syntex_errors"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -869,7 +881,7 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -911,13 +923,13 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "textwrap"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -939,8 +951,8 @@ version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -950,7 +962,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -965,7 +977,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -974,7 +986,7 @@ name = "tokio-proto"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -991,7 +1003,7 @@ name = "tokio-service"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -999,7 +1011,7 @@ name = "tokio-tls"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1028,7 +1040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1066,10 +1078,10 @@ dependencies = [
 
 [[package]]
 name = "users"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1135,7 +1147,7 @@ dependencies = [
 "checksum bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d828f97b58cc5de3e40c421d0cf2132d6b2da4ee0e11b8632fa838f0f9333ad6"
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
 "checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
-"checksum clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "867a885995b4184be051b70a592d4d70e32d7a188db6e8dff626af286a962771"
+"checksum clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0"
 "checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
 "checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
 "checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
@@ -1143,12 +1155,12 @@ dependencies = [
 "checksum crypt32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e34988f7e069e0b2f3bfc064295161e489b2d4e04a2e4248fb94360cdf00b4ec"
 "checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
 "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
-"checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90"
+"checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
 "checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
 "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
-"checksum futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4b63a4792d4f8f686defe3b39b92127fea6344de5d38202b2ee5a11bbbf29d6a"
+"checksum futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a82bdc62350ca9d7974c760e9665102fc9d740992a528c2254aa930e53b783c4"
 "checksum futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a283c84501e92cade5ea673a2a7ca44f71f209ccdd302a3e0896f50083d2c5ff"
-"checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a"
+"checksum gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)" = "e8310f7e9c890398b0e80e301c4f474e9918d2b27fca8f48486ca775fa9ffc5a"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
 "checksum hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "641abc3e3fcf0de41165595f801376e01106bca1fd876dda937730e477ca004c"
@@ -1157,12 +1169,12 @@ dependencies = [
 "checksum iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29d062ee61fccdf25be172e70f34c9f6efc597e1fb8f6526e8437b2046ab26be"
 "checksum ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)" = "232e76922883005380e831068f731ef0305541c9f77b30df3a1635047b16f370"
 "checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
-"checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c"
+"checksum itoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f74cf6ca1bdbc28496a2b9798ab7fccc2ca5a42cace95bb2b219577216a5fb90"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
 "checksum lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b585b7a6811fb03aa10e74b278a0f00f8dd9b45dc681f148bb29fa5cb61859b"
-"checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503"
+"checksum libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)" = "2370ca07ec338939e356443dac2296f581453c35fe1e3a3ed06023c49435f915"
 "checksum libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "a2aa04ec0100812d31a5366130ff9e793291787bc31da845bede4a00ea329830"
 "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
 "checksum magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf0336886480e671965f794bc9b6fce88503563013d1bfb7a502c81fe3ac527"
@@ -1188,10 +1200,11 @@ dependencies = [
 "checksum pnet_macros_support 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c79f254137dcce415bdf2c10b40cf74009a7a8d4a17985cc7773b41f7ccfaf1"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "eb250fd207a4729c976794d03db689c9be1d634ab5a1c9da9492a13d8fecbcdf"
-"checksum redox_syscall 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "9df6a71a1e67be2104410736b2389fb8e383c1d7e9e792d629ff13c02867147a"
+"checksum redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "8dde11f18c108289bef24469638a04dce49da56084f2d50618b226e47eb04509"
 "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
 "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
 "checksum reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5866613d84e2a39c0479a960bf2d0eff1fbfc934f02cd42b5c08c1e1efc5b1fd"
+"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
 "checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
@@ -1203,16 +1216,16 @@ dependencies = [
 "checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead"
 "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
 "checksum serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f7726f29ddf9731b17ff113c461e362c381d9d69433f79de4f3dd572488823e9"
-"checksum serde-xml-rs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fce1909691944ee6e9b9e6da69dee5d61e37e5b2fa0b85543d8529412f86f6e"
+"checksum serde-xml-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c06881f4313eec67d4ecfcd8e14339f6042cfc0de4b1bd3ceae74c29d597f68"
 "checksum serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cf823e706be268e73e7747b147aa31c8f633ab4ba31f115efb57e5047c3a76dd"
 "checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a"
 "checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b"
 "checksum serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce0fd303af908732989354c6f02e05e2e6d597152870f2c6990efb0577137480"
 "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
-"checksum slog 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "057f354e538bfb65380f06810d2ab85933872563b20f53daa8144e5beae3aa3b"
-"checksum slog-async 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afbebab3918ccc36e83dca6879dbe554fc2874d1c26e3dd5debf646a5ee60936"
+"checksum slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "64b6be37712e0980c6d16ab1dbea3df868857883f4464f7ec1e37db8999ee9f3"
+"checksum slog-async 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ad0c2eeab552a206f95303868338aa67041146da8f8978dba8343c2b29b8ec2"
 "checksum slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd3236e1818c147ed3003930289dc6457425aaca3a7dbb6b7f3032f075d865c5"
-"checksum slog-term 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8734c9ff9a45be6026599e15aad5c29c2beb35113488b6945391853a011690"
+"checksum slog-term 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b4dc32ad4eb5c7406c9aa333731803977fc962906af7e6f30ee9ccccc02076f"
 "checksum smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013"
 "checksum ssh-keys 0.1.0 (git+https://github.com/sdemos/ssh-keys)" = "<none>"
 "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
@@ -1227,7 +1240,7 @@ dependencies = [
 "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
-"checksum textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f86300c3e7416ee233abd7cda890c492007a3980f941f79185c753a701257167"
+"checksum textwrap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f728584ea33b0ad19318e20557cb0a39097751dbb07171419673502f848c7af6"
 "checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
 "checksum time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d788d3aa77bc0ef3e9621256885555368b47bd495c13dd2e7413c89f845520"
 "checksum tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e85d419699ec4b71bfe35bbc25bb8771e52eff0471a7f75c853ad06e200b4f86"
@@ -1238,13 +1251,13 @@ dependencies = [
 "checksum unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e01da42520092d0cd2d6ac3ae69eb21a22ad43ff195676b86f8c37f487d6b80"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
-"checksum unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18127285758f0e2c6cf325bb3f3d138a12fee27de4f23e146cd6a179f26c2cf3"
+"checksum unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946"
 "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
 "checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
 "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27"
-"checksum users 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7ae8fdf783cb9652109c99886459648feb92ecc749e6b8e7930f6decba74c7c"
+"checksum users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7d8fb16f17ce0e6a18a25ce39f08edb5fbe9a25f3f346c9dca5e6ffc0485cdf"
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
 "checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b"
 "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
diff --git a/src/providers/azure/crypto/mod.rs b/src/providers/azure/crypto/mod.rs
index bf5f1c03..0ebe112f 100644
--- a/src/providers/azure/crypto/mod.rs
+++ b/src/providers/azure/crypto/mod.rs
@@ -71,7 +71,9 @@ pub fn p12_to_ssh_pubkey(p12_der: &[u8]) -> Result<String> {
         .chain_err(|| format!("failed to get rsa contents from pkey"))?;
 
     // convert the openssl Rsa public key to an OpenSSH public key in string format
-    let ssh_pubkey = ssh_keys::PublicKey::from_rsa(&ssh_pubkey_pem).to_string("");
+    let e = ssh_pubkey_pem.e().unwrap().to_vec();
+    let n = ssh_pubkey_pem.n().unwrap().to_vec();
+    let ssh_pubkey = ssh_keys::PublicKey::from_rsa(e, n).to_string("");
 
     Ok(ssh_pubkey)
 }

From f13748ff529ec4f9ff99899e5c22fe1890b7cb90 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Fri, 25 Aug 2017 12:22:06 -0700
Subject: [PATCH 34/71] providers/ec2: fix mutability warning

ssh_keys didn't need to be mutable in this function, since ownership is
passed to the add_ssh_keys builder function.
---
 src/providers/ec2/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/providers/ec2/mod.rs b/src/providers/ec2/mod.rs
index 7487179d..5f1f46e3 100644
--- a/src/providers/ec2/mod.rs
+++ b/src/providers/ec2/mod.rs
@@ -43,7 +43,7 @@ pub fn fetch_metadata() -> Result<Metadata> {
     let region: Option<String> = client.get(retry::Json, url_for_key("dynamic/instance-identity/document")).send()?
         .map(|instance_id_doc: InstanceIdDoc| instance_id_doc.region);
 
-    let mut ssh_keys: Vec<String> = fetch_ssh_keys(client)?;
+    let ssh_keys: Vec<String> = fetch_ssh_keys(client)?;
 
     Ok(Metadata::builder()
         .add_attribute_if_exists("EC2_REGION".to_owned(), region)

From d505151e0b2053b7e0029871d651cdf593275bbb Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Mon, 28 Aug 2017 12:38:28 -0700
Subject: [PATCH 35/71] util: add strings parsing function

this adds a new util module with a generally useful key lookup function
---
 src/lib.rs      |  1 +
 src/util/mod.rs | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 src/util/mod.rs

diff --git a/src/lib.rs b/src/lib.rs
index 112d1007..72ce1756 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -45,6 +45,7 @@ mod metadata;
 mod ssh;
 mod network;
 mod retry;
+mod util;
 
 #[allow(unused_doc_comment)]
 pub mod errors {
diff --git a/src/util/mod.rs b/src/util/mod.rs
new file mode 100644
index 00000000..c7d81b21
--- /dev/null
+++ b/src/util/mod.rs
@@ -0,0 +1,52 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! utility functions
+
+pub fn key_lookup(delim: char, key: &str, contents: &str) -> Option<String> {
+    for l in contents.clone().lines() {
+        match l.find(delim) {
+            Some(index) => {
+                let l = l.to_owned();
+                let (k, val) = l.split_at(index+1);
+                if k != format!("{}{}", key, delim) {
+                    continue
+                }
+                return Some(val.to_owned())
+            }
+            None => continue,
+        }
+    }
+    None
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn key_lookup_test() {
+        let tests = vec![
+            ('=', "DNS", "foo=bar\nbaz=bax\nDNS=8.8.8.8\n", Some("8.8.8.8".to_owned())),
+            (':', "foo", "foo:bar", Some("bar".to_owned())),
+            (' ', "foo", "", None),
+            (':', "bar", "foo:bar\nbaz:bar", None),
+            (' ', "baz", "foo foo\nbaz bar", Some("bar".to_owned())),
+            (' ', "foo", "\n\n\n\n\n\n\n \n", None),
+        ];
+        for (delim, key, contents, expected_val) in tests {
+            let val = key_lookup(delim, key, contents);
+            assert_eq!(val, expected_val);
+        }
+    }
+}

From beee9c22b6f9936521b72609278c3cdb8f056691 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Tue, 29 Aug 2017 16:59:54 -0700
Subject: [PATCH 36/71] network: add from_string, bonding modes

add MacAddr::from_string and bonding modes, use ipnetwork crate
---
 Cargo.lock     |   1 +
 Cargo.toml     |   1 +
 src/lib.rs     |   2 +
 src/network.rs | 143 +++++++++++++++++++++++++++----------------------
 4 files changed, 84 insertions(+), 63 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5e135038..e6f81c65 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,6 +7,7 @@ dependencies = [
  "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 290ac92d..cb64b1fe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,6 +22,7 @@ reqwest = "0.7"
 hyper = "0.11"
 error-chain = "0.10"
 ssh-keys = { git = "https://github.com/sdemos/ssh-keys" }
+ipnetwork = "0.12"
 
 [dependencies.slog]
 version = "*"
diff --git a/src/lib.rs b/src/lib.rs
index 72ce1756..319072ac 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,6 +40,8 @@ extern crate ssh_keys;
 
 extern crate users;
 
+extern crate ipnetwork;
+
 mod providers;
 mod metadata;
 mod ssh;
diff --git a/src/network.rs b/src/network.rs
index 65f1109a..7578a2af 100644
--- a/src/network.rs
+++ b/src/network.rs
@@ -21,27 +21,69 @@ use std::fmt;
 use std::string::String;
 use std::string::ToString;
 
-#[derive(Clone, Copy, Debug)]
-pub struct IpNetwork {
-    addr: IpAddr,
-    prefix: u8,
-}
-
-impl fmt::Display for IpNetwork {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}/{}", self.addr, self.prefix)
+use ipnetwork::IpNetwork;
+use errors::*;
+
+pub const BONDING_MODE_BALANCE_RR: u32 = 0;
+pub const BONDING_MODE_ACTIVE_BACKUP: u32 = 1;
+pub const BONDING_MODE_BALANCE_XOR: u32 = 2;
+pub const BONDING_MODE_BROADCAST: u32 = 3;
+pub const BONDING_MODE_LACP: u32 = 4;
+pub const BONDING_MODE_BALANCE_TLB: u32 = 5;
+pub const BONDING_MODE_BALANCE_ALB: u32 = 6;
+
+const BONDING_MODES: [(u32,&str); 7] = [
+    (BONDING_MODE_BALANCE_RR,"balance-rr"),
+    (BONDING_MODE_ACTIVE_BACKUP,"active-backup"),
+    (BONDING_MODE_BALANCE_XOR,"balance-xor"),
+    (BONDING_MODE_BROADCAST,"broadcast"),
+    (BONDING_MODE_LACP,"802.3ad"),
+    (BONDING_MODE_BALANCE_TLB,"balance-tlb"),
+    (BONDING_MODE_BALANCE_ALB,"balance-alb"),
+];
+
+pub fn bonding_mode_to_string(mode: &u32) -> Result<String> {
+    for &(m,s) in BONDING_MODES.iter() {
+        if m == *mode {
+            return Ok(s.to_owned())
+        }
     }
+    Err(format!("no such bonding mode: {}", mode).into())
 }
 
 #[derive(Clone, Copy, Debug)]
 pub struct NetworkRoute {
-    destination: IpNetwork,
-    gateway: IpAddr,
+    pub destination: IpNetwork,
+    pub gateway: IpAddr,
 }
 
 #[derive(Clone, Copy, Debug)]
 pub struct MacAddr(pub u8, pub u8, pub u8,pub u8, pub u8, pub u8);
 
+impl MacAddr {
+    pub fn from_string(s: String) -> Result<MacAddr> {
+        let stripped_s = s.replace(":", "");
+        let mut chars = stripped_s.chars();
+        let mut octets = Vec::new();
+        for _ in 0..6 {
+            let mut s = String::new();
+            s.push_str(&chars.next().ok_or("invalid mac address")?.to_string());
+            s.push_str(&chars.next().ok_or("invalid mac address")?.to_string());
+            let num = u8::from_str_radix(&s, 16)
+                .chain_err(|| format!("invalid hexadecimal octet"))?;
+            octets.push(num);
+        }
+        Ok(MacAddr(
+            octets[0],
+            octets[1],
+            octets[2],
+            octets[3],
+            octets[4],
+            octets[5]
+        ))
+    }
+}
+
 impl fmt::Display for MacAddr {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{:02x}:{:02x}:{:02x}:{:02x}:{:02x}:{:02x}", self.0, self.1, self.2, self.3, self.4, self.5)
@@ -56,28 +98,28 @@ impl fmt::Display for MacAddr {
 /// so it's not really that big of a deal.
 #[derive(Clone, Debug)]
 pub struct Interface {
-    name: Option<String>,
-    mac_address: Option<MacAddr>,
-    priority: Option<u32>,
-    nameservers: Vec<IpAddr>,
-    ip_addresses: Vec<IpNetwork>,
-    routes: Vec<NetworkRoute>,
-    bond: Option<String>,
+    pub name: Option<String>,
+    pub mac_address: Option<MacAddr>,
+    pub priority: Option<u32>,
+    pub nameservers: Vec<IpAddr>,
+    pub ip_addresses: Vec<IpNetwork>,
+    pub routes: Vec<NetworkRoute>,
+    pub bond: Option<String>,
 }
 
 #[derive(Clone, Debug)]
 pub struct Section {
-    name: String,
-    attributes: Vec<(String, String)>,
+    pub name: String,
+    pub attributes: Vec<(String, String)>,
 }
 
 #[derive(Clone, Debug)]
 pub struct Device {
-    name: String,
-    kind: String,
-    mac_address: MacAddr,
-    priority: Option<u32>,
-    sections: Vec<Section>
+    pub name: String,
+    pub kind: String,
+    pub mac_address: MacAddr,
+    pub priority: Option<u32>,
+    pub sections: Vec<Section>
 }
 
 impl Interface {
@@ -150,6 +192,7 @@ impl Device {
 mod tests {
     use super::*;
     use std::net::{Ipv4Addr, Ipv6Addr};
+    use ipnetwork::{Ipv4Network,Ipv6Network};
 
     #[test]
     fn mac_addr_display() {
@@ -157,32 +200,6 @@ mod tests {
         assert_eq!(m.to_string(), "f4:00:34:09:73:ee");
     }
 
-    #[test]
-    fn ip_network_display() {
-        let ips = vec![
-            (IpNetwork {
-                addr: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
-                prefix: 8,
-            }, "127.0.0.1/8"),
-            (IpNetwork {
-                addr: IpAddr::V4(Ipv4Addr::new(129, 21, 50, 131)),
-                prefix: 32,
-            }, "129.21.50.131/32"),
-            (IpNetwork {
-                addr: IpAddr::V6(Ipv6Addr::new(0xfe80, 0, 0, 0, 0xf696, 0x34ff, 0xfe09, 0x7347)),
-                prefix: 64,
-            }, "fe80::f696:34ff:fe09:7347/64"),
-            (IpNetwork {
-                addr: IpAddr::V6(Ipv6Addr::new(0,0,0,0,0,0,0,1)),
-                prefix: 128,
-            }, "::1/128")
-        ];
-
-        for (ip, s) in ips {
-            assert_eq!(ip.to_string(), s);
-        }
-    }
-
     #[test]
     fn interface_unit_name() {
         let is = vec![
@@ -280,21 +297,21 @@ mod tests {
                     IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)),
                 ],
                 ip_addresses: vec![
-                    IpNetwork {
-                        addr: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
-                        prefix: 8,
-                    },
-                    IpNetwork {
-                        addr: IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)),
-                        prefix: 128,
-                    }
+                    IpNetwork::V4(Ipv4Network::new(
+                            Ipv4Addr::new(127, 0, 0, 1),
+                            8
+                        ).unwrap()),
+                    IpNetwork::V6(Ipv6Network::new(
+                            Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1),
+                            128
+                        ).unwrap()),
                 ],
                 routes: vec![
                     NetworkRoute {
-                        destination: IpNetwork {
-                            addr: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
-                            prefix: 8,
-                        },
+                        destination: IpNetwork::V4(Ipv4Network::new(
+                                Ipv4Addr::new(127, 0, 0, 1),
+                                8
+                            ).unwrap()),
                         gateway: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
                     }
                 ],

From f174add6d153e8913ea2e1a2051053b851cc12dc Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Tue, 29 Aug 2017 17:00:59 -0700
Subject: [PATCH 37/71] providers/packet: initial implementation

this adds getting all metadata from the packet metadata service
---
 src/providers/packet/mod.rs | 210 +++++++++++++++++++++++++++++++++++-
 1 file changed, 209 insertions(+), 1 deletion(-)

diff --git a/src/providers/packet/mod.rs b/src/providers/packet/mod.rs
index e82c2e93..2dce02fb 100644
--- a/src/providers/packet/mod.rs
+++ b/src/providers/packet/mod.rs
@@ -18,6 +18,214 @@ use metadata::Metadata;
 
 use errors::*;
 
+use retry;
+use std::fs::File;
+use std::io::Read;
+use std::str::FromStr;
+
+use util;
+
+use network;
+use network::{MacAddr,Interface,Device,Section,NetworkRoute};
+use std::net::{IpAddr,Ipv4Addr,Ipv6Addr};
+use ipnetwork;
+use ipnetwork::{IpNetwork,Ipv4Network,Ipv6Network};
+
+#[derive(Clone,Deserialize)]
+struct PacketData {
+    id: String,
+    hostname: String,
+    iqn: String,
+    plan: String,
+    facility: String,
+    tags: Vec<String>,
+    ssh_keys: Vec<String>,
+    network: PacketNetworkInfo,
+
+    error: Option<String>,
+    phone_home_url: String,
+}
+
+#[derive(Clone,Deserialize)]
+struct PacketNetworkInfo {
+    interfaces: Vec<PacketInterfaceInfo>,
+    addresses: Vec<PacketAddressInfo>,
+    bonding: PacketBondingMode,
+}
+
+#[derive(Clone,Deserialize)]
+struct PacketBondingMode {
+    mode: u32,
+}
+
+#[derive(Clone,Deserialize)]
+struct PacketInterfaceInfo {
+    name: String,
+    mac: String,
+}
+
+#[derive(Clone,Deserialize)]
+struct PacketAddressInfo {
+    id: String,
+    address_family: i32,
+    public: bool,
+    management: bool,
+    address: IpAddr,
+    netmask: IpAddr,
+    gateway: IpAddr,
+}
+
 pub fn fetch_metadata() -> Result<Metadata> {
-    unimplemented!();
+    let client = retry::Client::new()?;
+    let data: PacketData = client.get(retry::Json, "http://metadata.packet.net/metadata".to_owned()).send()?
+        .ok_or("not found")?;
+
+    let (interfaces,network_devices) = parse_network(&data.network)?;
+
+    let attrs = get_attrs(&data)?;
+
+    let mut m = Metadata::builder()
+        .add_ssh_keys(data.ssh_keys)
+        .set_hostname(data.hostname);
+
+    for (key,val) in attrs {
+        m = m.add_attribute(key,val);
+    }
+    for iface in interfaces {
+        m = m.add_network_interface(iface);
+    }
+    for netdev in network_devices {
+        m = m.add_network_device(netdev);
+    }
+    Ok(m.build())
+}
+
+fn get_dns_servers() -> Result<Vec<IpAddr>> {
+    let mut state = String::new();
+    let mut f = File::open("/run/systemd/netif/state")?;
+    f.read_to_string(&mut state)?;
+
+    let ip_strings = util::key_lookup('=', "DNS", &state)
+        .ok_or("DNS not found in netif state file")?;
+    let mut addrs = Vec::new();
+    for ip_string in ip_strings.split(' ') {
+        addrs.push(IpAddr::from_str(&ip_string)
+            .chain_err(|| format!("failed to parse IP address"))?);
+    }
+    if addrs.len() == 0 {
+        return Err(format!("no DNS servers in /run/systemd/netif/state").into());
+    }
+    Ok(addrs)
+}
+
+fn parse_network(netinfo: &PacketNetworkInfo) -> Result<(Vec<Interface>,Vec<Device>)> {
+    let mut interfaces = Vec::new();
+    for i in netinfo.interfaces.clone() {
+        interfaces.push(Interface {
+            mac_address: Some(MacAddr::from_string(i.mac)?),
+            bond: Some("bond0".to_owned()),
+            name: None,
+            priority: None,
+            nameservers: Vec::new(),
+            ip_addresses: Vec::new(),
+            routes: Vec::new(),
+        });
+    }
+    let mut iface = Interface{
+        name: Some("bond0".to_owned()),
+        priority: Some(5),
+        nameservers: get_dns_servers()?,
+        mac_address: None,
+        bond: None,
+        ip_addresses: Vec::new(),
+        routes: Vec::new(),
+    };
+    for a in netinfo.addresses.clone() {
+        let prefix = ipnetwork::ip_mask_to_prefix(a.netmask)
+            .chain_err(|| format!("invalid network mask"))?;
+        iface.ip_addresses.push(
+            match a.address {
+                IpAddr::V4(addrv4) => IpNetwork::V4(Ipv4Network::new(addrv4, prefix)
+                    .chain_err(|| format!("invalid IP address or prefix"))?),
+                IpAddr::V6(addrv6) => IpNetwork::V6(Ipv6Network::new(addrv6, prefix)
+                    .chain_err(|| format!("invalid IP address or prefix"))?),
+            }
+        );
+        let dest = match (a.public,a.address.clone()) {
+            (false,IpAddr::V4(_)) =>
+                    IpNetwork::V4(Ipv4Network::new(Ipv4Addr::new(10,0,0,0),8).unwrap()),
+            (true,IpAddr::V4(_)) =>
+                    IpNetwork::V4(Ipv4Network::new(Ipv4Addr::new(0,0,0,0),0).unwrap()),
+            (_,IpAddr::V6(_)) =>
+                    IpNetwork::V6(Ipv6Network::new(Ipv6Addr::new(0,0,0,0,0,0,0,0),0).unwrap()),
+        };
+        iface.routes.push(
+            NetworkRoute {
+                destination: dest,
+                gateway: a.gateway,
+            }
+
+        );
+    }
+    interfaces.push(iface);
+
+    let mut attrs = vec![
+		("TransmitHashPolicy".to_owned(), "layer3+4".to_owned()),
+		("MIIMonitorSec".to_owned(), ".1".to_owned()),
+		("UpDelaySec".to_owned(), ".2".to_owned()),
+		("DownDelaySec".to_owned(), ".2".to_owned()),
+		("Mode".to_owned(), network::bonding_mode_to_string(&netinfo.bonding.mode)?),
+    ];
+    if netinfo.bonding.mode == network::BONDING_MODE_LACP {
+        attrs.push(("LACPTransmitRate".to_owned(), "fast".to_owned()));
+    }
+    let network_devices = vec![
+        Device{
+            name: "bond0".to_owned(),
+            kind: "bond".to_owned(),
+            mac_address: interfaces[0].mac_address
+                .ok_or("first interface doesn't have a mac address, should be impossible")?
+                .clone(),
+            priority: Some(5),
+            sections: vec![
+                Section{
+                    name: "Bond".to_owned(),
+                    attributes: attrs,
+                }
+            ],
+        },
+    ];
+
+    Ok((interfaces,network_devices))
+}
+
+fn get_attrs(data: &PacketData) -> Result<Vec<(String,String)>> {
+    let mut attrs = Vec::new();
+    let mut v4_public_counter = 0;
+    let mut v4_private_counter = 0;
+    let mut v6_public_counter = 0;
+    let mut v6_private_counter = 0;
+    for a in data.network.addresses.clone() {
+        match (a.address,a.public) {
+            (IpAddr::V4(a),true) => {
+                attrs.push((format!("PACKET_IPV4_PUBLIC_{}", v4_public_counter), format!("{}", a)));
+                v4_public_counter = v4_public_counter + 1;
+            }
+            (IpAddr::V4(a),false) => {
+                attrs.push((format!("PACKET_IPV4_PRIVATE_{}", v4_private_counter), format!("{}", a)));
+                v4_private_counter = v4_private_counter + 1;
+            }
+            (IpAddr::V6(a),true) => {
+                attrs.push((format!("PACKET_IPV6_PUBLIC_{}", v6_public_counter), format!("{}", a)));
+                v6_public_counter = v6_public_counter + 1;
+            }
+            (IpAddr::V6(a),false) => {
+                attrs.push((format!("PACKET_IPV6_PRIVATE_{}", v6_private_counter), format!("{}", a)));
+                v6_private_counter = v6_private_counter + 1;
+            }
+        }
+    }
+    attrs.push(("PACKET_HOSTNAME".to_owned(), data.hostname.clone()));
+    attrs.push(("PACKET_PHONE_HOME_URL".to_owned(), data.phone_home_url.clone()));
+    Ok(attrs)
 }

From 0e66a3ffdfd84dc5252d6199161bf38152918dd8 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Wed, 30 Aug 2017 13:00:52 -0700
Subject: [PATCH 38/71] cargo: added clippy feature

this lets us easily run clippy with cargo build --features=[lints]
---
 Cargo.lock | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml |   5 +++
 2 files changed, 107 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index e6f81c65..037fdc17 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,6 +5,7 @@ dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.155 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -122,6 +123,16 @@ dependencies = [
  "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "cargo_metadata"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "cfg-if"
 version = "0.1.2"
@@ -152,6 +163,33 @@ dependencies = [
  "vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "clippy"
+version = "0.0.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy_lints 0.0.155 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "clippy_lints"
+version = "0.0.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "itertools 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pulldown-cmark 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "conv"
 version = "0.3.3"
@@ -210,6 +248,11 @@ name = "dtoa"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "either"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "error-chain"
 version = "0.10.0"
@@ -242,6 +285,11 @@ name = "gcc"
 version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "getopts"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "glob"
 version = "0.2.11"
@@ -322,6 +370,14 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "itoa"
 version = "0.3.2"
@@ -564,6 +620,20 @@ name = "pnet_macros_support"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "pulldown-cmark"
+version = "0.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quine-mc_cluskey"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "quote"
 version = "0.3.15"
@@ -709,6 +779,19 @@ name = "semver"
 version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "semver"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "serde"
 version = "1.0.11"
@@ -1018,6 +1101,14 @@ dependencies = [
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "toml"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "unicase"
 version = "2.0.0"
@@ -1146,9 +1237,12 @@ dependencies = [
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
 "checksum byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d"
 "checksum bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d828f97b58cc5de3e40c421d0cf2132d6b2da4ee0e11b8632fa838f0f9333ad6"
+"checksum cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "be1057b8462184f634c3a208ee35b0f935cfd94b694b26deadccd98732088d7b"
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
 "checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
 "checksum clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0"
+"checksum clippy 0.0.155 (registry+https://github.com/rust-lang/crates.io-index)" = "03ba983d61af163f1b3ccc31cf1eb4925e62264bdfdc4b6b7f2d8fa6b7cd30ec"
+"checksum clippy_lints 0.0.155 (registry+https://github.com/rust-lang/crates.io-index)" = "315166a7e8c0fa313d852dd9d156857ffdfd40aad7989df4b2035970a1a31f6a"
 "checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
 "checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
 "checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
@@ -1157,11 +1251,13 @@ dependencies = [
 "checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
 "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
+"checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a"
 "checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
 "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
 "checksum futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a82bdc62350ca9d7974c760e9665102fc9d740992a528c2254aa930e53b783c4"
 "checksum futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a283c84501e92cade5ea673a2a7ca44f71f209ccdd302a3e0896f50083d2c5ff"
 "checksum gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)" = "e8310f7e9c890398b0e80e301c4f474e9918d2b27fca8f48486ca775fa9ffc5a"
+"checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
 "checksum hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "641abc3e3fcf0de41165595f801376e01106bca1fd876dda937730e477ca004c"
@@ -1170,6 +1266,7 @@ dependencies = [
 "checksum iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29d062ee61fccdf25be172e70f34c9f6efc597e1fb8f6526e8437b2046ab26be"
 "checksum ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)" = "232e76922883005380e831068f731ef0305541c9f77b30df3a1635047b16f370"
 "checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
+"checksum itertools 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "22c285d60139cf413244894189ca52debcfd70b57966feed060da76802e415a0"
 "checksum itoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f74cf6ca1bdbc28496a2b9798ab7fccc2ca5a42cace95bb2b219577216a5fb90"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
@@ -1199,6 +1296,8 @@ dependencies = [
 "checksum pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d0364bc9319e77afb74fa65f6c8b0d73b1d3208f289cd227678f10562730791"
 "checksum pnet_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e77669156bd4cb7732fc11261a33cc56705100e3bed019ee1cbd84d97e2d9909"
 "checksum pnet_macros_support 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c79f254137dcce415bdf2c10b40cf74009a7a8d4a17985cc7773b41f7ccfaf1"
+"checksum pulldown-cmark 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "378e941dbd392c101f2cb88097fa4d7167bc421d4b88de3ff7dbee503bc3233b"
+"checksum quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "eb250fd207a4729c976794d03db689c9be1d634ab5a1c9da9492a13d8fecbcdf"
 "checksum redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "8dde11f18c108289bef24469638a04dce49da56084f2d50618b226e47eb04509"
@@ -1216,6 +1315,8 @@ dependencies = [
 "checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332"
 "checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead"
 "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
+"checksum semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f7726f29ddf9731b17ff113c461e362c381d9d69433f79de4f3dd572488823e9"
 "checksum serde-xml-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c06881f4313eec67d4ecfcd8e14339f6042cfc0de4b1bd3ceae74c29d597f68"
 "checksum serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cf823e706be268e73e7747b147aa31c8f633ab4ba31f115efb57e5047c3a76dd"
@@ -1249,6 +1350,7 @@ dependencies = [
 "checksum tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389"
 "checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
 "checksum tokio-tls 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d88e411cac1c87e405e4090be004493c5d8072a370661033b1a64ea205ec2e13"
+"checksum toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e"
 "checksum unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e01da42520092d0cd2d6ac3ae69eb21a22ad43ff195676b86f8c37f487d6b80"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
diff --git a/Cargo.toml b/Cargo.toml
index cb64b1fe..f1932cc1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,12 @@ hyper = "0.11"
 error-chain = "0.10"
 ssh-keys = { git = "https://github.com/sdemos/ssh-keys" }
 ipnetwork = "0.12"
+clippy = { version = "*", optional = true }
 
 [dependencies.slog]
 version = "*"
 features = ["max_level_trace"]
+
+[features]
+default = []
+lints = ["clippy"]

From 2a1be2da957e29fcd7e69d8705dbac2173b825d6 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Wed, 30 Aug 2017 13:01:11 -0700
Subject: [PATCH 39/71] *: fixed issues revealed by clippy

this also adds the clippy plugin when the clippy feature is enabled.
---
 src/bin/coreos-metadata.rs         | 16 +++++-----
 src/lib.rs                         |  6 ++--
 src/metadata.rs                    | 16 +++++-----
 src/network.rs                     |  4 +--
 src/providers/azure/crypto/mod.rs  | 22 +++++++-------
 src/providers/azure/crypto/x509.rs | 48 +++++++++++++++---------------
 src/providers/azure/mod.rs         | 36 +++++++++++-----------
 src/providers/ec2/mod.rs           | 11 ++++---
 src/providers/packet/mod.rs        | 27 ++++++++---------
 src/retry/mod.rs                   | 25 +++++++---------
 src/retry/raw_deserializer.rs      |  4 +--
 src/ssh.rs                         | 16 +++++-----
 src/util/mod.rs                    |  2 +-
 13 files changed, 117 insertions(+), 116 deletions(-)

diff --git a/src/bin/coreos-metadata.rs b/src/bin/coreos-metadata.rs
index 8f28c9c1..1aaef83d 100644
--- a/src/bin/coreos-metadata.rs
+++ b/src/bin/coreos-metadata.rs
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![cfg_attr(feature="clippy", feature(plugin))]
+#![cfg_attr(feature="clippy", plugin(clippy))]
+
 #[macro_use]
 extern crate clap;
 #[macro_use]
@@ -22,7 +25,6 @@ extern crate slog_term;
 extern crate slog_async;
 #[macro_use]
 extern crate slog_scope;
-extern crate users;
 
 extern crate coreos_metadata;
 
@@ -60,33 +62,33 @@ fn run() -> Result<()> {
 
     // initialize program
     let config = init()
-        .chain_err(|| format!("initialization"))?;
+        .chain_err(|| "initialization")?;
 
     trace!("cli configuration - {:?}", config);
 
     // fetch the metadata from the configured provider
     let metadata = fetch_metadata(&config.provider)
-        .chain_err(|| format!("fetching metadata from provider"))?;
+        .chain_err(|| "fetching metadata from provider")?;
 
     // write attributes if configured to do so
     config.attributes_file
         .map_or(Ok(()), |x| metadata.write_attributes(x))
-        .chain_err(|| format!("writing metadata attributes"))?;
+        .chain_err(|| "writing metadata attributes")?;
 
     // write ssh keys if configured to do so
     config.ssh_keys_user
         .map_or(Ok(()), |x| metadata.write_ssh_keys(x))
-        .chain_err(|| format!("writing ssh keys"))?;
+        .chain_err(|| "writing ssh keys")?;
 
     // write hostname if configured to do so
     config.hostname_file
         .map_or(Ok(()), |x| metadata.write_hostname(x))
-        .chain_err(|| format!("writing hostname"))?;
+        .chain_err(|| "writing hostname")?;
 
     // write network units if configured to do so
     config.network_units_dir
         .map_or(Ok(()), |x| metadata.write_network_units(x))
-        .chain_err(|| format!("writing network units"))?;
+        .chain_err(|| "writing network units")?;
 
     debug!("Done!");
 
diff --git a/src/lib.rs b/src/lib.rs
index 319072ac..40461527 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,12 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![cfg_attr(feature="clippy", feature(plugin))]
+#![cfg_attr(feature="clippy", plugin(clippy))]
+
 #[macro_use]
 extern crate hyper;
 extern crate reqwest;
 
 extern crate base64;
-extern crate byteorder;
 
 #[macro_use]
 extern crate error_chain;
@@ -74,7 +76,7 @@ use metadata::Metadata;
 
 use errors::*;
 
-/// fetch_metadata is the generic, top-level function that is used by the main
+/// `fetch_metadata` is the generic, top-level function that is used by the main
 /// function to fetch metadata. The configured provider is passed in and this
 /// function dispatches the call to the correct provider-specific fetch function
 pub fn fetch_metadata(provider: &str) -> Result<Metadata> {
diff --git a/src/metadata.rs b/src/metadata.rs
index f7420675..fa48d624 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -23,10 +23,12 @@ use network;
 
 use errors::*;
 
+#[derive(Default, Debug, Clone)]
 pub struct MetadataBuilder {
     metadata: Metadata,
 }
 
+#[derive(Default, Debug, Clone)]
 pub struct Metadata {
     attributes: HashMap<String, String>,
     hostname: Option<String>,
@@ -35,11 +37,11 @@ pub struct Metadata {
     net_dev: Vec<network::Device>,
 }
 
-fn create_file(filename: String) -> Result<File> {
+fn create_file(filename: &str) -> Result<File> {
     let file_path = Path::new(&filename);
     // create the directories if they don't exist
     let folder = file_path.parent()
-        .ok_or(format!("could not get parent directory of {:?}", file_path))?;
+        .ok_or_else(|| format!("could not get parent directory of {:?}", file_path))?;
     fs::create_dir_all(&folder)
         .chain_err(|| format!("failed to create directory {:?}", folder))?;
     // create (or truncate) the file we want to write to
@@ -114,7 +116,7 @@ impl Metadata {
     }
 
     pub fn write_attributes(&self, attributes_file_path: String) -> Result<()> {
-        let mut attributes_file = create_file(attributes_file_path)?;
+        let mut attributes_file = create_file(&attributes_file_path)?;
         for (k,v) in &self.attributes {
             write!(&mut attributes_file, "COREOS_{}={}\n", k, v)
                 .chain_err(|| format!("failed to write attributes to file {:?}", attributes_file))?;
@@ -126,20 +128,20 @@ impl Metadata {
         // and we need a new tool that does this generically for rust anyway
         // so I actually just have to rewrite update-ssh-keys
         let user = users::get_user_by_name(ssh_keys_user.as_str())
-            .ok_or(format!("could not find user with username {:?}", ssh_keys_user))?;
-        let authorized_keys_dir = ssh::create_authorized_keys_dir(user)?;
+            .ok_or_else(|| format!("could not find user with username {:?}", ssh_keys_user))?;
+        let authorized_keys_dir = ssh::create_authorized_keys_dir(&user)?;
         let mut authorized_keys_file = File::create(authorized_keys_dir.join("coreos-metadata"))
             .chain_err(|| format!("failed to create the file {:?} in the ssh authorized users directory", "coreos-metadata"))?;
         for ssh_key in &self.ssh_keys {
             write!(&mut authorized_keys_file, "{}\n", ssh_key)
                 .chain_err(|| format!("failed to write ssh key to file {:?}", authorized_keys_file))?;
         }
-        ssh::sync_authorized_keys(authorized_keys_dir)
+        ssh::sync_authorized_keys(&authorized_keys_dir)
     }
     pub fn write_hostname(&self, hostname_file_path: String) -> Result<()> {
         match self.hostname {
             Some(ref hostname) => {
-                let mut hostname_file = create_file(hostname_file_path)?;
+                let mut hostname_file = create_file(&hostname_file_path)?;
                 write!(&mut hostname_file, "{}\n", hostname)
                     .chain_err(|| format!("failed to write hostname {:?} to file {:?}", self.hostname, hostname_file))
             }
diff --git a/src/network.rs b/src/network.rs
index 7578a2af..9bad4064 100644
--- a/src/network.rs
+++ b/src/network.rs
@@ -43,7 +43,7 @@ const BONDING_MODES: [(u32,&str); 7] = [
 ];
 
 pub fn bonding_mode_to_string(mode: &u32) -> Result<String> {
-    for &(m,s) in BONDING_MODES.iter() {
+    for &(m,s) in &BONDING_MODES {
         if m == *mode {
             return Ok(s.to_owned())
         }
@@ -70,7 +70,7 @@ impl MacAddr {
             s.push_str(&chars.next().ok_or("invalid mac address")?.to_string());
             s.push_str(&chars.next().ok_or("invalid mac address")?.to_string());
             let num = u8::from_str_radix(&s, 16)
-                .chain_err(|| format!("invalid hexadecimal octet"))?;
+                .chain_err(|| "invalid hexadecimal octet")?;
             octets.push(num);
         }
         Ok(MacAddr(
diff --git a/src/providers/azure/crypto/mod.rs b/src/providers/azure/crypto/mod.rs
index 0ebe112f..7026fbee 100644
--- a/src/providers/azure/crypto/mod.rs
+++ b/src/providers/azure/crypto/mod.rs
@@ -28,9 +28,9 @@ use errors::*;
 pub fn mangle_pem(x509: &X509) -> Result<String> {
     // get the pem
     let pem = x509.to_pem()
-        .chain_err(|| format!("failed to convert x509 cert to pem"))?;
+        .chain_err(|| "failed to convert x509 cert to pem")?;
     let pem = String::from_utf8(pem)
-        .chain_err(|| format!("failed to convert x509 pem file from utf8 to a string"))?;
+        .chain_err(|| "failed to convert x509 pem file from utf8 to a string")?;
 
     // the pem needs to be mangled to send as a header
     Ok(pem.lines()
@@ -41,11 +41,11 @@ pub fn mangle_pem(x509: &X509) -> Result<String> {
 pub fn decrypt_cms(smime: &[u8], pkey: &PKey, x509: &X509) -> Result<Vec<u8>> {
     // now we need to read in that mime file
     let cms = CmsContentInfo::smime_read_cms(smime)
-        .chain_err(|| format!("failed to read cms file"))?;
+        .chain_err(|| "failed to read cms file")?;
 
     // and decrypt it's contents
-    let p12_der = cms.decrypt(&pkey, &x509)
-        .chain_err(|| format!("failed to decrypt cms file"))?;
+    let p12_der = cms.decrypt(pkey, x509)
+        .chain_err(|| "failed to decrypt cms file")?;
 
     Ok(p12_der)
 }
@@ -55,20 +55,20 @@ pub fn p12_to_ssh_pubkey(p12_der: &[u8]) -> Result<String> {
     // cryptographic structure. we read that in from the contents and parse it.
     // PKCS12 has the ability to have a password, but we don't have one, hence
     // empty string.
-    let p12 = Pkcs12::from_der(&p12_der)
-        .chain_err(|| format!("failed to get pkcs12 blob from der"))?;
+    let p12 = Pkcs12::from_der(p12_der)
+        .chain_err(|| "failed to get pkcs12 blob from der")?;
     let p12 = p12.parse("")
-        .chain_err(|| format!("failed to parse pkcs12 blob"))?;
+        .chain_err(|| "failed to parse pkcs12 blob")?;
 
     // PKCS12 has three parts. A pkey, a main x509 cert, and a list of other
     // x509 certs. The list of other x509 certs is called the chain. there is
     // only one cert in this chain, and it is the ssh public key.
     let ssh_pubkey_pem = p12.chain.get(0).unwrap();
-    // .chain_err(|| format!("failed to get cert from pkcs12 chain"))?;
+    // .chain_err(|| "failed to get cert from pkcs12 chain")?;
     let ssh_pubkey_pem = ssh_pubkey_pem.public_key() // get the public key from the x509 cert
-        .chain_err(|| format!("failed to get public key from cert"))?;
+        .chain_err(|| "failed to get public key from cert")?;
     let ssh_pubkey_pem = ssh_pubkey_pem.rsa()        // get the rsa contents from the pkey struct
-        .chain_err(|| format!("failed to get rsa contents from pkey"))?;
+        .chain_err(|| "failed to get rsa contents from pkey")?;
 
     // convert the openssl Rsa public key to an OpenSSH public key in string format
     let e = ssh_pubkey_pem.e().unwrap().to_vec();
diff --git a/src/providers/azure/crypto/x509.rs b/src/providers/azure/crypto/x509.rs
index f1eb0f35..f86ccc66 100644
--- a/src/providers/azure/crypto/x509.rs
+++ b/src/providers/azure/crypto/x509.rs
@@ -39,53 +39,53 @@ impl Config {
     }
 }
 
-pub fn generate_cert(config: Config) -> Result<(X509, PKey)> {
+pub fn generate_cert(config: &Config) -> Result<(X509, PKey)> {
     // generate an rsa public/private keypair
     let rsa = Rsa::generate(config.rsa_bits)
-        .chain_err(|| format!("failed to generate rsa keypair"))?;
+        .chain_err(|| "failed to generate rsa keypair")?;
     // put it into the pkey struct
     let pkey = PKey::from_rsa(rsa)
-        .chain_err(|| format!("failed to create pkey struct from rsa keypair"))?;
+        .chain_err(|| "failed to create pkey struct from rsa keypair")?;
 
     // make a new x509 certificate with the pkey we generated
     let mut x509builder = X509::builder()
-        .chain_err(|| format!("failed to make x509 builder"))?;
+        .chain_err(|| "failed to make x509 builder")?;
     x509builder.set_version(2)
-        .chain_err(|| format!("failed to set x509 version"))?;
+        .chain_err(|| "failed to set x509 version")?;
 
     // set the serial number to some big random positive integer
     let mut serial = bn::BigNum::new()
-        .chain_err(|| format!("failed to make new bignum"))?;
+        .chain_err(|| "failed to make new bignum")?;
     serial.rand(32, bn::MSB_ONE, false)
-        .chain_err(|| format!("failed to generate random bignum"))?;
+        .chain_err(|| "failed to generate random bignum")?;
     let serial = serial.to_asn1_integer()
-        .chain_err(|| format!("failed to get asn1 integer from bignum"))?;
+        .chain_err(|| "failed to get asn1 integer from bignum")?;
     x509builder.set_serial_number(&serial)
-        .chain_err(|| format!("failed to set x509 serial number"))?;
+        .chain_err(|| "failed to set x509 serial number")?;
 
     // call fails without expiration dates
     // I guess they are important anyway, but still
     x509builder.set_not_before(&Asn1Time::days_from_now(0).unwrap())
-        .chain_err(|| format!("failed to set x509 start date"))?;
+        .chain_err(|| "failed to set x509 start date")?;
     x509builder.set_not_after(&Asn1Time::days_from_now(config.expire_in_days).unwrap())
-        .chain_err(|| format!("failed to set x509 expiration date"))?;
+        .chain_err(|| "failed to set x509 expiration date")?;
 
     // add the issuer and subject name
     // it's set to "/CN=LinuxTransport"
     // if we want we can make that configurable later
     let mut x509namebuilder = X509Name::builder()
-        .chain_err(|| format!("failed to get x509name builder"))?;
+        .chain_err(|| "failed to get x509name builder")?;
     x509namebuilder.append_entry_by_text("CN", "LinuxTransport")
-        .chain_err(|| format!("failed to append /CN=LinuxTransport to x509name builder"))?;
+        .chain_err(|| "failed to append /CN=LinuxTransport to x509name builder")?;
     let x509name = x509namebuilder.build();
     x509builder.set_issuer_name(&x509name)
-        .chain_err(|| format!("failed to set x509 issuer name"))?;
+        .chain_err(|| "failed to set x509 issuer name")?;
     x509builder.set_subject_name(&x509name)
-        .chain_err(|| format!("failed to set x509 subject name"))?;
+        .chain_err(|| "failed to set x509 subject name")?;
 
     // set the public key
     x509builder.set_pubkey(&pkey)
-        .chain_err(|| format!("failed to set x509 pubkey"))?;
+        .chain_err(|| "failed to set x509 pubkey")?;
 
     // it also needs several extensions
     // in the openssl configuration file, these are set when generating certs
@@ -97,15 +97,15 @@ pub fn generate_cert(config: Config) -> Result<(X509, PKey)> {
     // need to add them manually.
     // we need to do them one at a time, and they need to be in this order
     let conf = Conf::new(ConfMethod::default())
-        .chain_err(|| format!("failed to make new conf struct"))?;
+        .chain_err(|| "failed to make new conf struct")?;
     // it seems like everything depends on the basic constraints, so let's do
     // that first.
     let bc = extension::BasicConstraints::new()
         .ca()
         .build()
-        .chain_err(|| format!("failed to build BasicConstraints extension"))?;
+        .chain_err(|| "failed to build BasicConstraints extension")?;
     x509builder.append_extension(bc)
-        .chain_err(|| format!("failed to append BasicConstraints extension"))?;
+        .chain_err(|| "failed to append BasicConstraints extension")?;
 
     // the akid depends on the skid. I guess it copies the skid when the cert is
     // self-signed or something, I'm not really sure.
@@ -115,10 +115,10 @@ pub fn generate_cert(config: Config) -> Result<(X509, PKey)> {
         let ext_con = x509builder.x509v3_context(None, Some(&conf));
         extension::SubjectKeyIdentifier::new()
             .build(&ext_con)
-            .chain_err(|| format!("failed to build SubjectKeyIdentifier extention"))?
+            .chain_err(|| "failed to build SubjectKeyIdentifier extention")?
     };
     x509builder.append_extension(skid)
-        .chain_err(|| format!("failed to append SubjectKeyIdentifier extention"))?;
+        .chain_err(|| "failed to append SubjectKeyIdentifier extention")?;
 
     // now that the skid is added we can add the akid
     let akid = {
@@ -127,14 +127,14 @@ pub fn generate_cert(config: Config) -> Result<(X509, PKey)> {
             .keyid(true)
             .issuer(false)
             .build(&ext_con)
-            .chain_err(|| format!("failed to build AuthorityKeyIdentifier extention"))?
+            .chain_err(|| "failed to build AuthorityKeyIdentifier extention")?
     };
     x509builder.append_extension(akid)
-        .chain_err(|| format!("failed to append AuthorityKeyIdentifier extention"))?;
+        .chain_err(|| "failed to append AuthorityKeyIdentifier extention")?;
 
     // self-sign the certificate
     x509builder.sign(&pkey, MessageDigest::sha256())
-        .chain_err(|| format!("failed to self-sign x509 cert"))?;
+        .chain_err(|| "failed to self-sign x509 cert")?;
 
     let x509 = x509builder.build();
 
diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index 9652fa90..19ffd0e0 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -103,7 +103,7 @@ struct Azure {
 impl Azure {
     fn new() -> Result<Self> {
         let addr = Azure::get_fabric_address()
-            .chain_err(|| format!("failed to get fabric address"))?;
+            .chain_err(|| "failed to get fabric address")?;
         let client = retry::Client::new()?
             .header(MSAgentName(MS_AGENT_NAME.to_owned()))
             .header(MSVersion(MS_VERSION.to_owned()));
@@ -112,7 +112,7 @@ impl Azure {
             endpoint: addr,
         };
         azure.is_fabric_compatible(MS_VERSION)
-            .chain_err(|| format!("failed version compatibility check"))?;
+            .chain_err(|| "failed version compatibility check")?;
         Ok(azure)
     }
 
@@ -154,13 +154,13 @@ impl Azure {
             }
         }
 
-        Err(format!("failed to retrieve fabric address").into())
+        Err("failed to retrieve fabric address".into())
     }
 
     fn is_fabric_compatible(&self, version: &str) -> Result<()> {
         let versions: Versions = self.client.get(retry::Xml, format!("http://{}/?comp=versions", self.endpoint)).send()
-            .chain_err(|| format!("failed to get versions"))?
-            .ok_or("failed to get versions: not found".to_owned())?;
+            .chain_err(|| "failed to get versions")?
+            .ok_or_else(|| "failed to get versions: not found")?;
 
         if versions.supported.versions.iter().any(|v| v == version) {
             Ok(())
@@ -171,8 +171,8 @@ impl Azure {
 
     fn get_certs_endpoint(&self) -> Result<String> {
         let goalstate: GoalState = self.client.get(retry::Xml, format!("http://{}/machine/?comp=goalstate", self.endpoint)).send()
-            .chain_err(|| format!("failed to get goal state"))?
-            .ok_or("failed to get goal state: not found response".to_owned())?;
+            .chain_err(|| "failed to get goal state")?
+            .ok_or_else(|| "failed to get goal state: not found response")?;
 
         // grab the certificates endpoint from the xml and return it
         let cert_endpoint: &str = &goalstate.container.role_instance_list.role_instances[0].configuration.certificates;
@@ -185,8 +185,8 @@ impl Azure {
             .header(MSCipherName("DES_EDE3_CBC".to_owned()))
             .header(MSCert(mangled_pem))
             .send()
-            .chain_err(|| format!("failed to get certificates"))?
-            .ok_or("failed to get certificates: not found".to_owned())?;
+            .chain_err(|| "failed to get certificates")?
+            .ok_or_else(|| "failed to get certificates: not found")?;
 
         // the cms decryption expects it to have MIME information on the top
         // since cms is really for email attachments...don't tell the cops.
@@ -200,29 +200,29 @@ impl Azure {
     fn get_ssh_pubkey(&self) -> Result<String> {
         // first we have to get the certificates endoint.
         let certs_endpoint = self.get_certs_endpoint()
-            .chain_err(|| format!("failed to get certs endpoint"))?;
+            .chain_err(|| "failed to get certs endpoint")?;
 
         // we have to generate the rsa public/private keypair and the x509 cert
         // that we use to make the request. this is equivalent to
         // `openssl req -x509 -nodes -subj /CN=LinuxTransport -days 365 -newkey rsa:2048 -keyout private.pem -out cert.pem`
-        let (x509, pkey) = x509::generate_cert(x509::Config::new(2048, 365))
-            .chain_err(|| format!("failed to generate keys"))?;
+        let (x509, pkey) = x509::generate_cert(&x509::Config::new(2048, 365))
+            .chain_err(|| "failed to generate keys")?;
 
         // mangle the pem file for the request
         let mangled_pem = crypto::mangle_pem(&x509)
-            .chain_err(|| format!("failed to mangle pem"))?;
+            .chain_err(|| "failed to mangle pem")?;
 
         // fetch the encrypted cms blob from the certs endpoint
         let smime = self.get_certs(certs_endpoint, mangled_pem)
-            .chain_err(|| format!("failed to get certs"))?;
+            .chain_err(|| "failed to get certs")?;
 
         // decrypt the cms blob
         let p12 = crypto::decrypt_cms(smime.as_bytes(), &pkey, &x509)
-            .chain_err(|| format!("failed to decrypt cms blob"))?;
+            .chain_err(|| "failed to decrypt cms blob")?;
 
         // convert that to the OpenSSH public key format
         let ssh_pubkey = crypto::p12_to_ssh_pubkey(&p12)
-            .chain_err(|| format!("failed to convert pkcs12 blob to ssh pubkey"))?;
+            .chain_err(|| "failed to convert pkcs12 blob to ssh pubkey")?;
 
         Ok(ssh_pubkey)
     }
@@ -230,10 +230,10 @@ impl Azure {
 
 pub fn fetch_metadata() -> Result<Metadata> {
     let provider = Azure::new()
-        .chain_err(|| format!("azure: failed create metadata client"))?;
+        .chain_err(|| "azure: failed create metadata client")?;
 
     let ssh_pubkey = provider.get_ssh_pubkey()
-        .chain_err(|| format!("azure: failed to get ssh pubkey"))?;
+        .chain_err(|| "azure: failed to get ssh pubkey")?;
 
     Ok(Metadata::builder()
        .add_ssh_keys(vec![ssh_pubkey])
diff --git a/src/providers/ec2/mod.rs b/src/providers/ec2/mod.rs
index 5f1f46e3..94d07546 100644
--- a/src/providers/ec2/mod.rs
+++ b/src/providers/ec2/mod.rs
@@ -32,7 +32,7 @@ struct InstanceIdDoc {
 
 pub fn fetch_metadata() -> Result<Metadata> {
     let client = retry::Client::new()
-        .chain_err(|| format!("ec2: failed to create http client"))?
+        .chain_err(|| "ec2: failed to create http client")?
         .return_on_404(true);
 
     let instance_id: Option<String> = client.get(retry::Raw, url_for_key("meta-data/instance-id")).send()?;
@@ -43,7 +43,7 @@ pub fn fetch_metadata() -> Result<Metadata> {
     let region: Option<String> = client.get(retry::Json, url_for_key("dynamic/instance-identity/document")).send()?
         .map(|instance_id_doc: InstanceIdDoc| instance_id_doc.region);
 
-    let ssh_keys: Vec<String> = fetch_ssh_keys(client)?;
+    let ssh_keys: Vec<String> = fetch_ssh_keys(&client)?;
 
     Ok(Metadata::builder()
         .add_attribute_if_exists("EC2_REGION".to_owned(), region)
@@ -57,7 +57,7 @@ pub fn fetch_metadata() -> Result<Metadata> {
         .build())
 }
 
-fn fetch_ssh_keys(client: retry::Client) -> Result<Vec<String>> {
+fn fetch_ssh_keys(client: &retry::Client) -> Result<Vec<String>> {
     let keydata: Option<String> = client.get(retry::Raw, url_for_key("meta-data/public-keys")).send()?;
     match keydata {
         Some(s) => {
@@ -70,9 +70,8 @@ fn fetch_ssh_keys(client: retry::Client) -> Result<Vec<String>> {
                 }
                 let ssh_key: String = client.get(retry::Raw, url_for_key(&format!("meta-data/public-keys/{}/openssh-key", tokens[0]))).send()?
                     .ok_or("missing ssh key")?;
-                match res.as_mut() {
-                    Ok(keys) => (*keys).push(ssh_key),
-                    Err(_) => (),
+                if let Ok(keys) = res.as_mut() {
+                    keys.push(ssh_key);
                 }
             }
             res
diff --git a/src/providers/packet/mod.rs b/src/providers/packet/mod.rs
index 2dce02fb..d8b59bf9 100644
--- a/src/providers/packet/mod.rs
+++ b/src/providers/packet/mod.rs
@@ -109,11 +109,11 @@ fn get_dns_servers() -> Result<Vec<IpAddr>> {
         .ok_or("DNS not found in netif state file")?;
     let mut addrs = Vec::new();
     for ip_string in ip_strings.split(' ') {
-        addrs.push(IpAddr::from_str(&ip_string)
-            .chain_err(|| format!("failed to parse IP address"))?);
+        addrs.push(IpAddr::from_str(ip_string)
+            .chain_err(|| "failed to parse IP address")?);
     }
-    if addrs.len() == 0 {
-        return Err(format!("no DNS servers in /run/systemd/netif/state").into());
+    if addrs.is_empty() {
+        return Err("no DNS servers in /run/systemd/netif/state".into());
     }
     Ok(addrs)
 }
@@ -142,16 +142,16 @@ fn parse_network(netinfo: &PacketNetworkInfo) -> Result<(Vec<Interface>,Vec<Devi
     };
     for a in netinfo.addresses.clone() {
         let prefix = ipnetwork::ip_mask_to_prefix(a.netmask)
-            .chain_err(|| format!("invalid network mask"))?;
+            .chain_err(|| "invalid network mask")?;
         iface.ip_addresses.push(
             match a.address {
                 IpAddr::V4(addrv4) => IpNetwork::V4(Ipv4Network::new(addrv4, prefix)
-                    .chain_err(|| format!("invalid IP address or prefix"))?),
+                    .chain_err(|| "invalid IP address or prefix")?),
                 IpAddr::V6(addrv6) => IpNetwork::V6(Ipv6Network::new(addrv6, prefix)
-                    .chain_err(|| format!("invalid IP address or prefix"))?),
+                    .chain_err(|| "invalid IP address or prefix")?),
             }
         );
-        let dest = match (a.public,a.address.clone()) {
+        let dest = match (a.public,a.address) {
             (false,IpAddr::V4(_)) =>
                     IpNetwork::V4(Ipv4Network::new(Ipv4Addr::new(10,0,0,0),8).unwrap()),
             (true,IpAddr::V4(_)) =>
@@ -184,8 +184,7 @@ fn parse_network(netinfo: &PacketNetworkInfo) -> Result<(Vec<Interface>,Vec<Devi
             name: "bond0".to_owned(),
             kind: "bond".to_owned(),
             mac_address: interfaces[0].mac_address
-                .ok_or("first interface doesn't have a mac address, should be impossible")?
-                .clone(),
+                .ok_or("first interface doesn't have a mac address, should be impossible")?,
             priority: Some(5),
             sections: vec![
                 Section{
@@ -209,19 +208,19 @@ fn get_attrs(data: &PacketData) -> Result<Vec<(String,String)>> {
         match (a.address,a.public) {
             (IpAddr::V4(a),true) => {
                 attrs.push((format!("PACKET_IPV4_PUBLIC_{}", v4_public_counter), format!("{}", a)));
-                v4_public_counter = v4_public_counter + 1;
+                v4_public_counter += 1;
             }
             (IpAddr::V4(a),false) => {
                 attrs.push((format!("PACKET_IPV4_PRIVATE_{}", v4_private_counter), format!("{}", a)));
-                v4_private_counter = v4_private_counter + 1;
+                v4_private_counter += 1;
             }
             (IpAddr::V6(a),true) => {
                 attrs.push((format!("PACKET_IPV6_PUBLIC_{}", v6_public_counter), format!("{}", a)));
-                v6_public_counter = v6_public_counter + 1;
+                v6_public_counter += 1;
             }
             (IpAddr::V6(a),false) => {
                 attrs.push((format!("PACKET_IPV6_PRIVATE_{}", v6_private_counter), format!("{}", a)));
-                v6_private_counter = v6_private_counter + 1;
+                v6_private_counter += 1;
             }
         }
     }
diff --git a/src/retry/mod.rs b/src/retry/mod.rs
index bca97c79..ea4f6edd 100644
--- a/src/retry/mod.rs
+++ b/src/retry/mod.rs
@@ -36,11 +36,8 @@ mod raw_deserializer;
 
 use errors::*;
 
-#[inline(always)]
 pub fn default_initial_backoff() -> Duration { Duration::new(1,0) }
-#[inline(always)]
 pub fn default_max_backoff() -> Duration { Duration::new(5,0) }
-#[inline(always)]
 pub fn default_max_attempts() -> u32 { 10 }
 
 pub trait Deserializer {
@@ -57,7 +54,7 @@ impl Deserializer for Xml {
         where T: for<'de> serde::Deserialize<'de>, R: Read
     {
         serde_xml_rs::deserialize(r)
-            .chain_err(|| format!("failed xml deserialization"))
+            .chain_err(|| "failed xml deserialization")
     }
     fn content_type(&self) -> ContentType {
         ContentType("text/xml; charset=utf-8".parse().unwrap())
@@ -72,7 +69,7 @@ impl Deserializer for Json {
         where T: serde::de::DeserializeOwned, R: Read
     {
         serde_json::from_reader(r)
-            .chain_err(|| format!("failed json deserialization"))
+            .chain_err(|| "failed json deserialization")
     }
     fn content_type(&self) -> ContentType {
         ContentType("text/json; charset=utf-8".parse().unwrap())
@@ -87,7 +84,7 @@ impl Deserializer for Raw {
         where T: for<'de> serde::Deserialize<'de>, R: Read
     {
         raw_deserializer::from_reader(r)
-            .chain_err(|| format!("failed raw deserialization"))
+            .chain_err(|| "failed raw deserialization")
     }
     fn content_type(&self) -> ContentType {
         ContentType("text/plain; charset=utf-8".parse().unwrap())
@@ -107,7 +104,7 @@ pub struct Client {
 impl Client {
     pub fn new() -> Result<Self> {
         let client = reqwest::Client::new()
-            .chain_err(|| format!("failed to initialize client"))?;
+            .chain_err(|| "failed to initialize client")?;
         Ok(Client{
             client,
             headers: header::Headers::new(),
@@ -160,10 +157,10 @@ impl Client {
             d,
             client: self.client.clone(),
             headers: self.headers.clone(),
-            initial_backoff: self.initial_backoff.clone(),
-            max_backoff: self.max_backoff.clone(),
-            max_attempts: self.max_attempts.clone(),
-            return_on_404: self.return_on_404.clone(),
+            initial_backoff: self.initial_backoff,
+            max_backoff: self.max_backoff,
+            max_attempts: self.max_attempts,
+            return_on_404: self.return_on_404,
         }
     }
 }
@@ -196,7 +193,7 @@ impl<D> RequestBuilder<D>
         where T: for<'de> serde::Deserialize<'de>
     {
         let url = reqwest::Url::parse(self.url.as_str())
-            .chain_err(|| format!("failed to parse uri"))?;
+            .chain_err(|| "failed to parse uri")?;
         let mut req = Request::new(Method::Get, url);
         req.headers_mut().extend(self.headers.iter());
         req.headers_mut().set(self.d.content_type());
@@ -214,8 +211,8 @@ impl<D> RequestBuilder<D>
                     (reqwest::StatusCode::Ok,_) => {
                         info!("Fetch successful");
                         self.d.deserialize(resp)
-                            .map(|x| Some(x))
-                            .chain_err(|| format!("failed to deserialize data"))
+                            .map(Some)
+                            .chain_err(|| "failed to deserialize data")
                     }
                     (reqwest::StatusCode::NotFound,true) => {
                         info!("Fetch failed with 404: resource not found");
diff --git a/src/retry/raw_deserializer.rs b/src/retry/raw_deserializer.rs
index 8656cba7..c00764b4 100644
--- a/src/retry/raw_deserializer.rs
+++ b/src/retry/raw_deserializer.rs
@@ -32,7 +32,7 @@ impl RawDeserializer
     {
         let mut s = String::new();
         r.read_to_string(&mut s)
-            .chain_err(|| format!("error reading"))?;
+            .chain_err(|| "error reading")?;
         Ok(RawDeserializer { s })
     }
 }
@@ -42,7 +42,7 @@ pub fn from_reader<T, R>(r: R) -> Result<T>
 {
     let mut deserializer = RawDeserializer::from_reader(r)?;
     Ok(T::deserialize(&mut deserializer)
-       .chain_err(|| format!("error deserializing"))?)
+       .chain_err(|| "error deserializing")?)
 }
 
 impl<'de, 'a> de::Deserializer<'de> for &'a mut RawDeserializer {
diff --git a/src/ssh.rs b/src/ssh.rs
index 10657f4a..8552201f 100644
--- a/src/ssh.rs
+++ b/src/ssh.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! ssh manipulates the authorized_keys directory and file
+//! ssh manipulates the `authorized_keys` directory and file
 //! TODO(sdemos):
 //! right now this doesn't do the file locking expected by the other tools which manipulate this directory
 //! for testing purposes, I'll leave it that way for now. If this ever gets used in real life, fix this somehow.
@@ -21,14 +21,14 @@
 
 use std::fs;
 use std::fs::File;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::io::prelude::*;
 use users::os::unix::UserExt;
 use users;
 
 use errors::*;
 
-pub fn create_authorized_keys_dir(user: users::User) -> Result<PathBuf> {
+pub fn create_authorized_keys_dir(user: &users::User) -> Result<PathBuf> {
     // construct the path to the authorized keys directory
     let ssh_dir = user.home_dir().join(".ssh");
     let authorized_keys_dir = ssh_dir.join("authorized_keys.d");
@@ -46,21 +46,21 @@ pub fn create_authorized_keys_dir(user: users::User) -> Result<PathBuf> {
         // if there is, copy it into the authorized keys directory
         let preserved_keys_file = authorized_keys_dir.join("orig_authorzied_keys");
         fs::copy(&authorized_keys_file, preserved_keys_file)
-            .chain_err(|| format!("failed to copy old authorzied keys file"))?;
+            .chain_err(|| "failed to copy old authorzied keys file")?;
     }
     // then we are done
     Ok(authorized_keys_dir)
 }
 
-pub fn sync_authorized_keys(authorized_keys_dir: PathBuf) -> Result<()> {
+pub fn sync_authorized_keys(authorized_keys_dir: &Path) -> Result<()> {
     let ssh_dir = authorized_keys_dir.parent()
-        .ok_or(format!("could not get parent directory of {:?}", authorized_keys_dir))?;
+        .ok_or_else(|| format!("could not get parent directory of {:?}", authorized_keys_dir))?;
     let mut authorized_keys_file = File::create(ssh_dir.join("authorized_keys"))
         .chain_err(|| format!("failed to create file {:?}", ssh_dir.join("authorized_keys")))?;
-    flatten_dir(&mut authorized_keys_file, &authorized_keys_dir)
+    flatten_dir(&mut authorized_keys_file, authorized_keys_dir)
 }
 
-fn flatten_dir(mut file: &mut File, dir: &PathBuf) -> Result<()> {
+fn flatten_dir(mut file: &mut File, dir: &Path) -> Result<()> {
     let dir_contents = fs::read_dir(&dir)
         .chain_err(|| format!("failed to read from directory {:?}", dir))?;
     for entry in dir_contents {
diff --git a/src/util/mod.rs b/src/util/mod.rs
index c7d81b21..e8bb2bf4 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -15,7 +15,7 @@
 //! utility functions
 
 pub fn key_lookup(delim: char, key: &str, contents: &str) -> Option<String> {
-    for l in contents.clone().lines() {
+    for l in contents.lines() {
         match l.find(delim) {
             Some(index) => {
                 let l = l.to_owned();

From 468e472e28ea9bd92624f1cc9f4ac0c1ef94f9df Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 1 Sep 2017 10:42:00 -0700
Subject: [PATCH 40/71] *: use `update-ssh-keys` crate

the `update-ssh-keys` crate takes care of all the expected file locking and
general behavior around the authorized_keys.d folder. use that instead of our
own solution.

also store ssh keys in PublicKey format instead of just strings
---
 Cargo.lock                        | 41 ++++++++++++---
 Cargo.toml                        |  1 +
 src/lib.rs                        |  6 ++-
 src/metadata.rs                   | 40 +++++++++------
 src/providers/azure/crypto/mod.rs |  6 +--
 src/providers/azure/mod.rs        |  9 ++--
 src/providers/ec2/mod.rs          |  2 +-
 src/providers/packet/mod.rs       |  2 +-
 src/ssh.rs                        | 83 -------------------------------
 9 files changed, 72 insertions(+), 118 deletions(-)
 delete mode 100644 src/ssh.rs

diff --git a/Cargo.lock b/Cargo.lock
index 037fdc17..b6c256c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22,6 +22,7 @@ dependencies = [
  "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-term 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ssh-keys 0.1.0 (git+https://github.com/sdemos/ssh-keys)",
+ "update-ssh-keys 0.1.0 (git+https://github.com/sdemos/update-ssh-keys-rs)",
  "users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -64,7 +65,7 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "backtrace-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -258,7 +259,7 @@ name = "error-chain"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -266,6 +267,16 @@ name = "foreign-types"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "fs2"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "futures"
 version = "0.1.15"
@@ -380,7 +391,7 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -832,7 +843,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -843,7 +854,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -898,7 +909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "ssh-keys"
 version = "0.1.0"
-source = "git+https://github.com/sdemos/ssh-keys#4ca84db2615502004d0dc2fdb706ec24eceec885"
+source = "git+https://github.com/sdemos/ssh-keys#3c6162c640ae8d418ad61898bb02bdab53fe0998"
 dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1158,6 +1169,18 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "update-ssh-keys"
+version = "0.1.0"
+source = "git+https://github.com/sdemos/update-ssh-keys-rs#c60b09ecbf3d6e843091dc4fb9ac9b034242f019"
+dependencies = [
+ "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ssh-keys 0.1.0 (git+https://github.com/sdemos/ssh-keys)",
+ "users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "url"
 version = "1.5.1"
@@ -1229,7 +1252,7 @@ dependencies = [
 "checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
 "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
 "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
-"checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76"
+"checksum backtrace 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "99f2ce94e22b8e664d95c57fff45b98a966c2252b60691d0b7aeeccd88d70983"
 "checksum backtrace-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "afccc5772ba333abccdf60d55200fa3406f8c59dcf54d5f7998c9107d3799c7c"
 "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
 "checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
@@ -1254,6 +1277,7 @@ dependencies = [
 "checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a"
 "checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
 "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
+"checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
 "checksum futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a82bdc62350ca9d7974c760e9665102fc9d740992a528c2254aa930e53b783c4"
 "checksum futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a283c84501e92cade5ea673a2a7ca44f71f209ccdd302a3e0896f50083d2c5ff"
 "checksum gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)" = "e8310f7e9c890398b0e80e301c4f474e9918d2b27fca8f48486ca775fa9ffc5a"
@@ -1267,7 +1291,7 @@ dependencies = [
 "checksum ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)" = "232e76922883005380e831068f731ef0305541c9f77b30df3a1635047b16f370"
 "checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
 "checksum itertools 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "22c285d60139cf413244894189ca52debcfd70b57966feed060da76802e415a0"
-"checksum itoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f74cf6ca1bdbc28496a2b9798ab7fccc2ca5a42cace95bb2b219577216a5fb90"
+"checksum itoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ac17257442c2ed77dbc9fd555cf83c58b0c7f7d0e8f2ae08c0ac05c72842e1f6"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
@@ -1359,6 +1383,7 @@ dependencies = [
 "checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
 "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum update-ssh-keys 0.1.0 (git+https://github.com/sdemos/update-ssh-keys-rs)" = "<none>"
 "checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27"
 "checksum users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7d8fb16f17ce0e6a18a25ce39f08edb5fbe9a25f3f346c9dca5e6ffc0485cdf"
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
diff --git a/Cargo.toml b/Cargo.toml
index f1932cc1..37bee081 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,6 +22,7 @@ reqwest = "0.7"
 hyper = "0.11"
 error-chain = "0.10"
 ssh-keys = { git = "https://github.com/sdemos/ssh-keys" }
+update-ssh-keys = { git = "https://github.com/sdemos/update-ssh-keys-rs" }
 ipnetwork = "0.12"
 clippy = { version = "*", optional = true }
 
diff --git a/src/lib.rs b/src/lib.rs
index 40461527..1f0cd1b2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -39,6 +39,7 @@ extern crate pnet;
 
 extern crate openssl;
 extern crate ssh_keys;
+extern crate update_ssh_keys;
 
 extern crate users;
 
@@ -46,7 +47,6 @@ extern crate ipnetwork;
 
 mod providers;
 mod metadata;
-mod ssh;
 mod network;
 mod retry;
 mod util;
@@ -54,6 +54,10 @@ mod util;
 #[allow(unused_doc_comment)]
 pub mod errors {
     error_chain!{
+        links {
+            PublicKey(::ssh_keys::errors::Error, ::ssh_keys::errors::ErrorKind);
+            AuthorizedKeys(::update_ssh_keys::errors::Error, ::update_ssh_keys::errors::ErrorKind);
+        }
         foreign_links {
             Log(::slog::Error);
             XmlDeserialize(::serde_xml_rs::Error);
diff --git a/src/metadata.rs b/src/metadata.rs
index fa48d624..a9c9066e 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -18,7 +18,8 @@ use std::path::Path;
 use std::io::prelude::*;
 use std::collections::HashMap;
 use users;
-use ssh;
+use ssh_keys::PublicKey;
+use update_ssh_keys::AuthorizedKeys;
 use network;
 
 use errors::*;
@@ -32,7 +33,7 @@ pub struct MetadataBuilder {
 pub struct Metadata {
     attributes: HashMap<String, String>,
     hostname: Option<String>,
-    ssh_keys: Vec<String>,
+    ssh_keys: Vec<PublicKey>,
     network: Vec<network::Interface>,
     net_dev: Vec<network::Device>,
 }
@@ -80,7 +81,15 @@ impl MetadataBuilder {
         }
     }
 
-    pub fn add_ssh_keys(mut self, mut ssh_keys: Vec<String>) -> Self {
+    pub fn add_ssh_keys(mut self, ssh_keys: Vec<String>) -> Result<Self> {
+        for key in ssh_keys {
+            let key = PublicKey::parse(&key)?;
+            self.metadata.ssh_keys.push(key);
+        }
+        Ok(self)
+    }
+
+    pub fn add_publickeys(mut self, mut ssh_keys: Vec<PublicKey>) -> Self {
         self.metadata.ssh_keys.append(&mut ssh_keys);
         self
     }
@@ -124,19 +133,20 @@ impl Metadata {
         Ok(())
     }
     pub fn write_ssh_keys(&self, ssh_keys_user: String) -> Result<()> {
-        // this function actually needs to be pretty complicated
-        // and we need a new tool that does this generically for rust anyway
-        // so I actually just have to rewrite update-ssh-keys
-        let user = users::get_user_by_name(ssh_keys_user.as_str())
+        // find the ssh keys user and open their ssh authorized keys directory
+        let user = users::get_user_by_name(&ssh_keys_user)
             .ok_or_else(|| format!("could not find user with username {:?}", ssh_keys_user))?;
-        let authorized_keys_dir = ssh::create_authorized_keys_dir(&user)?;
-        let mut authorized_keys_file = File::create(authorized_keys_dir.join("coreos-metadata"))
-            .chain_err(|| format!("failed to create the file {:?} in the ssh authorized users directory", "coreos-metadata"))?;
-        for ssh_key in &self.ssh_keys {
-            write!(&mut authorized_keys_file, "{}\n", ssh_key)
-                .chain_err(|| format!("failed to write ssh key to file {:?}", authorized_keys_file))?;
-        }
-        ssh::sync_authorized_keys(&authorized_keys_dir)
+        let mut authorized_keys_dir = AuthorizedKeys::open(user, true)
+            .chain_err(|| format!("failed to open authorzied keys directory for user '{}'", ssh_keys_user))?;
+
+        // add the ssh keys to the directory
+        authorized_keys_dir.add_keys("coreos-metadata", self.ssh_keys.clone(), true, true)?;
+
+        // write the changes and sync the directory
+        authorized_keys_dir.write()
+            .chain_err(|| "failed to update authorized keys directory")?;
+        authorized_keys_dir.sync()
+            .chain_err(|| "failed to update authorized keys")
     }
     pub fn write_hostname(&self, hostname_file_path: String) -> Result<()> {
         match self.hostname {
diff --git a/src/providers/azure/crypto/mod.rs b/src/providers/azure/crypto/mod.rs
index 7026fbee..a2c7e987 100644
--- a/src/providers/azure/crypto/mod.rs
+++ b/src/providers/azure/crypto/mod.rs
@@ -21,7 +21,7 @@ use openssl::pkey::PKey;
 use openssl::cms::CmsContentInfo;
 use openssl::pkcs12::Pkcs12;
 
-use ssh_keys;
+use ssh_keys::PublicKey;
 
 use errors::*;
 
@@ -50,7 +50,7 @@ pub fn decrypt_cms(smime: &[u8], pkey: &PKey, x509: &X509) -> Result<Vec<u8>> {
     Ok(p12_der)
 }
 
-pub fn p12_to_ssh_pubkey(p12_der: &[u8]) -> Result<String> {
+pub fn p12_to_ssh_pubkey(p12_der: &[u8]) -> Result<PublicKey> {
     // the contents of that encrypted cms blob we got are actually a different
     // cryptographic structure. we read that in from the contents and parse it.
     // PKCS12 has the ability to have a password, but we don't have one, hence
@@ -73,7 +73,7 @@ pub fn p12_to_ssh_pubkey(p12_der: &[u8]) -> Result<String> {
     // convert the openssl Rsa public key to an OpenSSH public key in string format
     let e = ssh_pubkey_pem.e().unwrap().to_vec();
     let n = ssh_pubkey_pem.n().unwrap().to_vec();
-    let ssh_pubkey = ssh_keys::PublicKey::from_rsa(e, n).to_string("");
+    let ssh_pubkey = PublicKey::from_rsa(e, n);
 
     Ok(ssh_pubkey)
 }
diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index 19ffd0e0..1f9a781f 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -17,14 +17,11 @@
 mod crypto;
 
 use self::crypto::x509;
-
 use errors::*;
-
 use metadata::Metadata;
-
 use pnet;
-
 use retry;
+use ssh_keys::PublicKey;
 
 use std::net::{IpAddr, Ipv4Addr};
 use std::fs::File;
@@ -197,7 +194,7 @@ impl Azure {
     }
 
     // put it all together
-    fn get_ssh_pubkey(&self) -> Result<String> {
+    fn get_ssh_pubkey(&self) -> Result<PublicKey> {
         // first we have to get the certificates endoint.
         let certs_endpoint = self.get_certs_endpoint()
             .chain_err(|| "failed to get certs endpoint")?;
@@ -236,6 +233,6 @@ pub fn fetch_metadata() -> Result<Metadata> {
         .chain_err(|| "azure: failed to get ssh pubkey")?;
 
     Ok(Metadata::builder()
-       .add_ssh_keys(vec![ssh_pubkey])
+       .add_publickeys(vec![ssh_pubkey])
        .build())
 }
diff --git a/src/providers/ec2/mod.rs b/src/providers/ec2/mod.rs
index 94d07546..cb56dfb0 100644
--- a/src/providers/ec2/mod.rs
+++ b/src/providers/ec2/mod.rs
@@ -53,7 +53,7 @@ pub fn fetch_metadata() -> Result<Metadata> {
         .add_attribute_if_exists("EC2_HOSTNAME".to_owned(), hostname.clone())
         .add_attribute_if_exists("EC2_AVAILABILITY_ZONE".to_owned(), availability_zone)
         .set_hostname_if_exists(hostname)
-        .add_ssh_keys(ssh_keys)
+        .add_ssh_keys(ssh_keys)?
         .build())
 }
 
diff --git a/src/providers/packet/mod.rs b/src/providers/packet/mod.rs
index d8b59bf9..fac95fd3 100644
--- a/src/providers/packet/mod.rs
+++ b/src/providers/packet/mod.rs
@@ -85,7 +85,7 @@ pub fn fetch_metadata() -> Result<Metadata> {
     let attrs = get_attrs(&data)?;
 
     let mut m = Metadata::builder()
-        .add_ssh_keys(data.ssh_keys)
+        .add_ssh_keys(data.ssh_keys)?
         .set_hostname(data.hostname);
 
     for (key,val) in attrs {
diff --git a/src/ssh.rs b/src/ssh.rs
deleted file mode 100644
index 8552201f..00000000
--- a/src/ssh.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2017 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! ssh manipulates the `authorized_keys` directory and file
-//! TODO(sdemos):
-//! right now this doesn't do the file locking expected by the other tools which manipulate this directory
-//! for testing purposes, I'll leave it that way for now. If this ever gets used in real life, fix this somehow.
-//! the real fix is https://bugzilla.mindrot.org/show_bug.cgi?id=2755 but if that doesn't make it in, the
-//! second best fix is to rewrite `update-ssh-keys` in rust as a library/binary combo
-
-use std::fs;
-use std::fs::File;
-use std::path::{Path, PathBuf};
-use std::io::prelude::*;
-use users::os::unix::UserExt;
-use users;
-
-use errors::*;
-
-pub fn create_authorized_keys_dir(user: &users::User) -> Result<PathBuf> {
-    // construct the path to the authorized keys directory
-    let ssh_dir = user.home_dir().join(".ssh");
-    let authorized_keys_dir = ssh_dir.join("authorized_keys.d");
-    // check if the authorized keys directory exists
-    if authorized_keys_dir.is_dir() {
-        // if it does, just return
-        return Ok(authorized_keys_dir);
-    }
-    // if it doesn't, create it
-    fs::create_dir_all(&authorized_keys_dir)
-        .chain_err(|| format!("failed to create directory {:?}", authorized_keys_dir))?;
-    // check if there is an authorized keys file
-    let authorized_keys_file = ssh_dir.join("authorized_keys");
-    if authorized_keys_file.is_file() {
-        // if there is, copy it into the authorized keys directory
-        let preserved_keys_file = authorized_keys_dir.join("orig_authorzied_keys");
-        fs::copy(&authorized_keys_file, preserved_keys_file)
-            .chain_err(|| "failed to copy old authorzied keys file")?;
-    }
-    // then we are done
-    Ok(authorized_keys_dir)
-}
-
-pub fn sync_authorized_keys(authorized_keys_dir: &Path) -> Result<()> {
-    let ssh_dir = authorized_keys_dir.parent()
-        .ok_or_else(|| format!("could not get parent directory of {:?}", authorized_keys_dir))?;
-    let mut authorized_keys_file = File::create(ssh_dir.join("authorized_keys"))
-        .chain_err(|| format!("failed to create file {:?}", ssh_dir.join("authorized_keys")))?;
-    flatten_dir(&mut authorized_keys_file, authorized_keys_dir)
-}
-
-fn flatten_dir(mut file: &mut File, dir: &Path) -> Result<()> {
-    let dir_contents = fs::read_dir(&dir)
-        .chain_err(|| format!("failed to read from directory {:?}", dir))?;
-    for entry in dir_contents {
-        let entry = entry.chain_err(|| format!("failed to read entry in directory {:?}", dir))?;
-        let path = entry.path();
-        if path.is_dir() {
-            // if it's a directory, recurse into it
-            flatten_dir(&mut file, &path)?;
-        } else {
-            let mut from = File::open(&path)
-                .chain_err(|| format!("failed to open file {:?}", path))?;
-            let mut contents = String::new();
-            from.read_to_string(&mut contents)
-                .chain_err(|| format!("failed to read file {:?}", path))?;
-            write!(&mut file, "{}\n", contents)
-                .chain_err(|| format!("failed to write to file {:?}", file))?;
-        }
-    }
-    Ok(())
-}

From 68e2d389c5d3f6bb937dfcc2b9b983a8cc36a350 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Fri, 25 Aug 2017 13:02:55 -0700
Subject: [PATCH 41/71] providers/gce: initial implementation

this gets all the metadata from the gce metadata service
---
 src/providers/gce/mod.rs | 74 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/src/providers/gce/mod.rs b/src/providers/gce/mod.rs
index ef7d7966..6134449e 100644
--- a/src/providers/gce/mod.rs
+++ b/src/providers/gce/mod.rs
@@ -18,6 +18,78 @@ use metadata::Metadata;
 
 use errors::*;
 
+use retry;
+
+header! {(MetadataFlavor, "Metadata-Flavor") => [String]}
+const GOOGLE: &str = "Google";
+
+fn url_for_key(key: &str) -> String {
+    format!("http://metadata.google.internal/computeMetadata/v1/{}", key)
+}
+
+// Google's metadata service returns a 200 success even if there is no resource. If an empty body
+// was returned, it means there was no result
+fn empty_to_none(s: Option<String>) -> Option<String> {
+    match s {
+        Some(s) => if &s == "" { None } else { Some(s) },
+        x => x,
+    }
+}
+
 pub fn fetch_metadata() -> Result<Metadata> {
-    unimplemented!();
+    let client = retry::Client::new()?
+        .header(MetadataFlavor(GOOGLE.to_owned()))
+        .return_on_404(true);
+    let public: Option<String> = client.get(retry::Raw, url_for_key("instance/network-interfaces/0/access-configs/0/external-ip")).send()?;
+    let local: Option<String> = client.get(retry::Raw, url_for_key("instance/network-interfaces/0/ip")).send()?;
+    let hostname: Option<String> = client.get(retry::Raw, url_for_key("instance/hostname")).send()?;
+
+    let ssh_keys = fetch_all_ssh_keys(&client)?;
+
+    Ok(Metadata::builder()
+        .add_attribute_if_exists("GCE_IP_LOCAL_0".to_owned(), empty_to_none(local))
+        .add_attribute_if_exists("GCE_IP_EXTERNAL_0".to_owned(), empty_to_none(public))
+        .add_attribute_if_exists("GCE_HOSTNAME".to_owned(), empty_to_none(hostname.clone()))
+        .set_hostname_if_exists(hostname)
+        .add_ssh_keys(ssh_keys)?
+        .build())
+}
+
+fn fetch_all_ssh_keys(client: &retry::Client) -> Result<Vec<String>> {
+    let keys = fetch_ssh_keys(client, "instance/attributes/sshKeys")?;
+    if !keys.is_empty() {
+        return Ok(keys);
+    }
+    let mut keys = fetch_ssh_keys(client, "instance/attributes/ssh-keys")?;
+
+    let block_project_keys: Option<String> = client.clone().get(retry::Raw, url_for_key("instance/attributes/block-project-ssh-keys")).send()?;
+
+    if block_project_keys == Some("true".to_owned()) {
+        return Ok(keys);
+    }
+
+    keys.append(&mut fetch_ssh_keys(client, "project/attributes/sshKeys")?);
+
+    Ok(keys)
+}
+
+fn fetch_ssh_keys(client: &retry::Client, key: &str) -> Result<Vec<String>> {
+    let key_data: Option<String> = client.get(retry::Raw, url_for_key(key)).send()?;
+    if let Some(key_data) = key_data {
+        let mut keys = Vec::new();
+        for l in key_data.lines() {
+            if l.is_empty() {
+                continue
+            }
+            let mut l = l.to_owned();
+            let index = l.find(':')
+                .ok_or("character ':' not found in line in key data")?;
+            keys.push(l.split_off(index+1));
+        }
+        Ok(keys)
+    } else {
+        // The user must have not provided any keys
+        Ok(Vec::new())
+    }
+
 }

From 9e2c130b99e2ee9c8809d0175b6ddf48154234db Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 1 Sep 2017 13:56:35 -0700
Subject: [PATCH 42/71] network: use pnet::util:MacAddr

we used to implement this ourselves. here we delete it and use a library
we already import to do it instead.
---
 src/network.rs              | 35 +----------------------------------
 src/providers/packet/mod.rs |  8 ++++++--
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/src/network.rs b/src/network.rs
index 9bad4064..45f440a8 100644
--- a/src/network.rs
+++ b/src/network.rs
@@ -17,7 +17,7 @@
 //! the necessary unit.
 
 use std::net::IpAddr;
-use std::fmt;
+use pnet::util::MacAddr;
 use std::string::String;
 use std::string::ToString;
 
@@ -57,39 +57,6 @@ pub struct NetworkRoute {
     pub gateway: IpAddr,
 }
 
-#[derive(Clone, Copy, Debug)]
-pub struct MacAddr(pub u8, pub u8, pub u8,pub u8, pub u8, pub u8);
-
-impl MacAddr {
-    pub fn from_string(s: String) -> Result<MacAddr> {
-        let stripped_s = s.replace(":", "");
-        let mut chars = stripped_s.chars();
-        let mut octets = Vec::new();
-        for _ in 0..6 {
-            let mut s = String::new();
-            s.push_str(&chars.next().ok_or("invalid mac address")?.to_string());
-            s.push_str(&chars.next().ok_or("invalid mac address")?.to_string());
-            let num = u8::from_str_radix(&s, 16)
-                .chain_err(|| "invalid hexadecimal octet")?;
-            octets.push(num);
-        }
-        Ok(MacAddr(
-            octets[0],
-            octets[1],
-            octets[2],
-            octets[3],
-            octets[4],
-            octets[5]
-        ))
-    }
-}
-
-impl fmt::Display for MacAddr {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:02x}:{:02x}:{:02x}:{:02x}:{:02x}:{:02x}", self.0, self.1, self.2, self.3, self.4, self.5)
-    }
-}
-
 /// for naming purposes an interface needs either a name or an address.
 /// it can have both. but it can't have neither.
 /// there isn't really a way to express this in the type system
diff --git a/src/providers/packet/mod.rs b/src/providers/packet/mod.rs
index fac95fd3..442bf9b7 100644
--- a/src/providers/packet/mod.rs
+++ b/src/providers/packet/mod.rs
@@ -26,7 +26,8 @@ use std::str::FromStr;
 use util;
 
 use network;
-use network::{MacAddr,Interface,Device,Section,NetworkRoute};
+use network::{Interface,Device,Section,NetworkRoute};
+use pnet::util::MacAddr;
 use std::net::{IpAddr,Ipv4Addr,Ipv6Addr};
 use ipnetwork;
 use ipnetwork::{IpNetwork,Ipv4Network,Ipv6Network};
@@ -121,8 +122,11 @@ fn get_dns_servers() -> Result<Vec<IpAddr>> {
 fn parse_network(netinfo: &PacketNetworkInfo) -> Result<(Vec<Interface>,Vec<Device>)> {
     let mut interfaces = Vec::new();
     for i in netinfo.interfaces.clone() {
+        let mac = MacAddr::from_str(&i.mac)
+            .map_err(|err| Error::from(format!("{:?}", err)))
+            .chain_err(|| format!("failed to parse mac address: '{}'", i.mac))?;
         interfaces.push(Interface {
-            mac_address: Some(MacAddr::from_string(i.mac)?),
+            mac_address: Some(mac),
             bond: Some("bond0".to_owned()),
             name: None,
             priority: None,

From 84fef014361c938133ef38c542e9fe633f38b1ae Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Tue, 29 Aug 2017 16:58:52 -0700
Subject: [PATCH 43/71] providers/digitalocean: initial implementation

this gets all metadata from the digitalocean metadata service.
---
 src/providers/digitalocean/mod.rs | 232 +++++++++++++++++++++++++++++-
 1 file changed, 229 insertions(+), 3 deletions(-)

diff --git a/src/providers/digitalocean/mod.rs b/src/providers/digitalocean/mod.rs
index 991492cf..0b66e4cb 100644
--- a/src/providers/digitalocean/mod.rs
+++ b/src/providers/digitalocean/mod.rs
@@ -14,10 +14,236 @@
 
 //! digital ocean metadata fetcher
 
-use metadata::Metadata;
+use retry;
+use metadata;
+use network;
+use ipnetwork;
+use ipnetwork::{IpNetwork,Ipv4Network,Ipv6Network};
+use pnet::util::MacAddr;
+
+use std::str::FromStr;
+use std::net::{IpAddr,Ipv4Addr,Ipv6Addr};
+use std::collections::HashMap;
 
 use errors::*;
 
-pub fn fetch_metadata() -> Result<Metadata> {
-    unimplemented!();
+#[derive(Clone,Deserialize)]
+struct Address {
+    ip_address: IpAddr,
+    netmask: Option<IpAddr>,
+    cidr: Option<u8>,
+    gateway: IpAddr,
+}
+
+#[derive(Clone,Deserialize)]
+struct Interface {
+    ipv4: Option<Address>,
+    ipv6: Option<Address>,
+    anchor_ipv4: Option<Address>,
+    mac: String,
+    #[serde(rename = "type")]
+    type_name: String,
+}
+
+#[derive(Clone,Deserialize)]
+struct Interfaces {
+    public: Option<Vec<Interface>>,
+    private: Option<Vec<Interface>>,
+}
+
+#[derive(Clone,Deserialize)]
+struct DNS {
+    nameservers: Vec<IpAddr>
+}
+
+#[derive(Clone,Deserialize)]
+struct Metadata {
+    hostname: String,
+    interfaces: Interfaces,
+    public_keys: Vec<String>,
+    region: String,
+    dns: DNS,
+}
+
+pub fn fetch_metadata() -> Result<metadata::Metadata> {
+    let client = retry::Client::new()?;
+    let data: Metadata = client.get(retry::Json, "http://169.254.169.254/metadata/v1.json".to_owned()).send()?
+        .ok_or("not found")?;
+
+    let attrs = parse_attrs(&data)?;
+    let interfaces = parse_network(&data)?;
+
+    let mut m = metadata::Metadata::builder()
+        .add_ssh_keys(data.public_keys)?
+        .set_hostname(data.hostname);
+
+    for (key,val) in attrs {
+        m = m.add_attribute(key,val);
+    }
+    for iface in interfaces {
+        m = m.add_network_interface(iface);
+    }
+    Ok(m.build())
+}
+
+fn parse_attrs(data: &Metadata) -> Result<Vec<(String,String)>> {
+    let mut attrs = Vec::new();
+
+    attrs.push(("DIGITALOCEAN_HOSTNAME".to_owned(), data.hostname.clone()));
+    attrs.push(("DIGITALOCEAN_REGION".to_owned(), data.region.clone()));
+
+    let mut public_counter = 0;
+    let mut private_counter = 0;
+    if let Some(ifaces) = data.interfaces.public.clone() {
+        for a in ifaces {
+            if a.ipv4.is_some() {
+                attrs.push((
+                    format!("DIGITALOCEAN_IPV4_PUBLIC_{}", public_counter),
+                    format!("{}", a.ipv4.unwrap().ip_address)
+                ));
+            }
+            if a.ipv6.is_some() {
+                attrs.push((
+                    format!("DIGITALOCEAN_IPV6_PUBLIC_{}", public_counter),
+                    format!("{}", a.ipv6.unwrap().ip_address)
+                ));
+            }
+            if a.anchor_ipv4.is_some() {
+                attrs.push((
+                    format!("DIGITALOCEAN_IPV4_ANCHOR_{}", public_counter),
+                    format!("{}", a.anchor_ipv4.unwrap().ip_address)
+                ));
+            }
+            public_counter += 1;
+        }
+    }
+    if let Some(ifaces) = data.interfaces.private.clone() {
+        for a in ifaces {
+            if a.ipv4.is_some() {
+                attrs.push((
+                    format!("DIGITALOCEAN_IPV4_PRIVATE_{}", public_counter),
+                    format!("{}", a.ipv4.unwrap().ip_address)
+                ));
+            }
+            if a.ipv6.is_some() {
+                attrs.push((
+                    format!("DIGITALOCEAN_IPV6_PRIVATE_{}", private_counter),
+                    format!("{}", a.ipv6.unwrap().ip_address)
+                ));
+            }
+            private_counter += 1;
+        }
+    }
+    Ok(attrs)
+}
+
+fn parse_network(data: &Metadata) -> Result<Vec<network::Interface>> {
+    let mut interfaces = Vec::new();
+    if let Some(ifaces) = data.interfaces.public.clone() {
+        interfaces.extend(parse_interfaces(data, ifaces)?);
+    }
+    if let Some(ifaces) = data.interfaces.private.clone() {
+        interfaces.extend(parse_interfaces(data, ifaces)?);
+    }
+    Ok(interfaces)
+}
+
+fn parse_interfaces(data: &Metadata, interfaces: Vec<Interface>) -> Result<Vec<network::Interface>> {
+    let mut iface_config_map: HashMap<MacAddr,network::Interface> = HashMap::new();
+    for iface in interfaces {
+        let mac = MacAddr::from_str(&iface.mac)
+            .map_err(|e| Error::from(format!("{:?}", e)))
+            .chain_err(|| "failed to parse mac address")?;
+        let (mut addrs, mut routes) = parse_interface(&iface)?;
+
+        if let Some(existing_iface) = iface_config_map.get_mut(&mac) {
+            addrs.extend(existing_iface.ip_addresses.clone());
+            routes.extend(existing_iface.routes.clone());
+        }
+        iface_config_map.insert(mac, network::Interface{
+            mac_address: Some(mac),
+            nameservers: data.dns.nameservers.clone(),
+            ip_addresses: addrs,
+            routes: routes,
+            bond: None,
+            name: None,
+            priority: None,
+        });
+    }
+    let mut iface_configs = Vec::new();
+    for i in iface_config_map.values() {
+        iface_configs.push(i.clone());
+    }
+    Ok(iface_configs)
+}
+
+fn parse_interface(interface: &Interface) -> Result<(Vec<IpNetwork>,Vec<network::NetworkRoute>)> {
+    let mut addrs = Vec::new();
+    let mut routes = Vec::new();
+
+    if interface.ipv4.is_some() {
+        let netmask = interface.clone().ipv4.unwrap().netmask
+            .ok_or("missing netmask for ipv4 address")?;
+        let prefix = ipnetwork::ip_mask_to_prefix(netmask)
+            .chain_err(|| "invalid network mask")?;
+        let a = match interface.clone().ipv4.unwrap().ip_address {
+            IpAddr::V4(a) => Some(a),
+            IpAddr::V6(_) => None,
+        }.ok_or("ipv6 address in ipv4 field")?;
+        let net = IpNetwork::V4(Ipv4Network::new(a, prefix)
+            .chain_err(|| "invalid ip address or prefix")?);
+        addrs.push(net);
+        routes.push(network::NetworkRoute{
+            destination: net,
+            gateway: interface.clone().ipv4.unwrap().gateway,
+        });
+
+        if interface.type_name == "public" {
+            routes.push(network::NetworkRoute{
+                destination: IpNetwork::V4(Ipv4Network::new(Ipv4Addr::new(0,0,0,0),0)
+                                    .chain_err(|| "invalid ip address or prefix")?),
+                gateway: interface.clone().ipv4.unwrap().gateway,
+            });
+        }
+    }
+    if interface.ipv6.is_some() {
+        let cidr = interface.clone().ipv6.unwrap().cidr
+            .ok_or("missing cidr for ipv6 address")?;
+        let a = match interface.clone().ipv6.unwrap().ip_address {
+            IpAddr::V4(_) => None,
+            IpAddr::V6(a) => Some(a),
+        }.ok_or("ipv4 address in ipv6 field")?;
+        let net = IpNetwork::V6(Ipv6Network::new(a, cidr)
+            .chain_err(|| "invalid ip address or prefix")?);
+        addrs.push(net);
+        routes.push(network::NetworkRoute{
+            destination: net,
+            gateway: interface.clone().ipv6.unwrap().gateway,
+        });
+        if interface.type_name == "public" {
+            routes.push(network::NetworkRoute{
+                destination: IpNetwork::V6(Ipv6Network::new(Ipv6Addr::new(0,0,0,0,0,0,0,0),0)
+                                    .chain_err(|| "invalid ip address or prefix")?),
+                gateway: interface.clone().ipv6.unwrap().gateway,
+            });
+        }
+    }
+    if interface.anchor_ipv4.is_some() {
+        let netmask = interface.clone().anchor_ipv4.unwrap().netmask
+            .ok_or("missing netmask for anchor ipv4 address")?;
+        let prefix = ipnetwork::ip_mask_to_prefix(netmask)
+            .chain_err(|| "invalid network mask")?;
+        let a = match interface.clone().anchor_ipv4.unwrap().ip_address {
+            IpAddr::V4(a) => Some(a),
+            IpAddr::V6(_) => None,
+        }.ok_or("ipv6 address in ipv4 field")?;
+        let net = IpNetwork::V4(Ipv4Network::new(a, prefix)
+            .chain_err(|| "invalid ip address or prefix")?);
+        addrs.push(net);
+        routes.push(network::NetworkRoute{
+            destination: net,
+            gateway: interface.clone().anchor_ipv4.unwrap().gateway,
+        });
+    }
+    Ok((addrs,routes))
 }

From 202f4bd5664d0f7e96f3f1a373a2fbb9882b3cf6 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 30 Aug 2017 17:35:00 -0700
Subject: [PATCH 44/71] providers/vagrant_virtualbox: implementation

this implements vagrant_virtual box metadata fetching
---
 Cargo.lock                              | 42 ++++++++++++++++++++++++
 Cargo.toml                              |  1 +
 src/lib.rs                              |  4 ++-
 src/providers/vagrant_virtualbox/mod.rs | 43 ++++++++++++++++++++++++-
 4 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b6c256c0..cf2384bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,6 +7,7 @@ dependencies = [
  "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy 0.0.155 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hostname 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -31,6 +32,15 @@ name = "adler32"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "advapi32-sys"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "advapi32-sys"
 version = "0.2.0"
@@ -306,6 +316,15 @@ name = "glob"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "hostname"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winutil 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "httparse"
 version = "1.2.3"
@@ -394,6 +413,15 @@ name = "itoa"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "kernel32-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1229,6 +1257,16 @@ name = "winapi-build"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "winutil"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
@@ -1248,6 +1286,7 @@ dependencies = [
 
 [metadata]
 "checksum adler32 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6cbd0b9af8587c72beadc9f72d35b9fbb070982c9e6203e46e93f10df25f8f45"
+"checksum advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "307c92332867e586720c0222ee9d890bbe8431711efed8a1b06bc5b40fc66bd7"
 "checksum advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a"
 "checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
 "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
@@ -1283,6 +1322,7 @@ dependencies = [
 "checksum gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)" = "e8310f7e9c890398b0e80e301c4f474e9918d2b27fca8f48486ca775fa9ffc5a"
 "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
+"checksum hostname 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d865f01509e69c001c31b8c341607d93caef4ecf6836ffee39a1702430147943"
 "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
 "checksum hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "641abc3e3fcf0de41165595f801376e01106bca1fd876dda937730e477ca004c"
 "checksum hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c81fa95203e2a6087242c38691a0210f23e9f3f8f944350bd676522132e2985"
@@ -1292,6 +1332,7 @@ dependencies = [
 "checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
 "checksum itertools 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "22c285d60139cf413244894189ca52debcfd70b57966feed060da76802e415a0"
 "checksum itoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ac17257442c2ed77dbc9fd555cf83c58b0c7f7d0e8f2ae08c0ac05c72842e1f6"
+"checksum kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e014dab1082fd9d80ea1fa6fcb261b47ed3eb511612a14198bb507701add083e"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
@@ -1392,5 +1433,6 @@ dependencies = [
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+"checksum winutil 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9486f81d058e5faff87ed37e6f476505f2c0fae341d46d53fddc73a88a26fec5"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562"
diff --git a/Cargo.toml b/Cargo.toml
index 37bee081..6c4d9db7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,6 +25,7 @@ ssh-keys = { git = "https://github.com/sdemos/ssh-keys" }
 update-ssh-keys = { git = "https://github.com/sdemos/update-ssh-keys-rs" }
 ipnetwork = "0.12"
 clippy = { version = "*", optional = true }
+hostname = "0.1"
 
 [dependencies.slog]
 version = "*"
diff --git a/src/lib.rs b/src/lib.rs
index 1f0cd1b2..58abee60 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -42,9 +42,11 @@ extern crate ssh_keys;
 extern crate update_ssh_keys;
 
 extern crate users;
+extern crate hostname;
 
 extern crate ipnetwork;
 
+
 mod providers;
 mod metadata;
 mod network;
@@ -91,7 +93,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Metadata> {
         "gce" => gce::fetch_metadata(),
         "openstack" => openstack::fetch_metadata(),
         "packet" => packet::fetch_metadata(),
-        "vagrant_virtualbox" => vagrant_virtualbox::fetch_metadata(),
+        "vagrant-virtualbox" => vagrant_virtualbox::fetch_metadata(),
         _ => Err(errors::ErrorKind::UnknownProvider(provider.to_owned()).into()),
     }
 }
diff --git a/src/providers/vagrant_virtualbox/mod.rs b/src/providers/vagrant_virtualbox/mod.rs
index 99c453b8..48e6e5e5 100644
--- a/src/providers/vagrant_virtualbox/mod.rs
+++ b/src/providers/vagrant_virtualbox/mod.rs
@@ -18,6 +18,47 @@ use metadata::Metadata;
 
 use errors::*;
 
+use std::net::IpAddr;
+use std::time::Duration;
+use std::thread;
+
+use hostname;
+use pnet;
+
 pub fn fetch_metadata() -> Result<Metadata> {
-    unimplemented!();
+    let h = hostname::get_hostname().ok_or("unable to get hostname")?;
+    let ip = get_ip()?;
+
+    Ok(Metadata::builder()
+       .add_attribute("VAGRANT_VIRTUALBOX_PRIVATE_IPV4".to_owned(), ip)
+       .add_attribute("VAGRANT_VIRTUALBOX_HOSTNAME".to_owned(), h.clone())
+       .set_hostname(h)
+       .build())
+}
+
+fn get_ip() -> Result<String> {
+    let max_attempts = 30;
+    for _ in 0..max_attempts {
+        let iface = find_eth1();
+        if let Some(iface) = iface {
+            for a in iface.ips {
+                if let IpAddr::V4(a) = a.ip() {
+                    return Ok(format!("{}", a));
+                }
+            }
+        }
+        info!("eth1 not found or is lacking an ipv4 address; waiting 2 seconds");
+        thread::sleep(Duration::from_secs(2));
+    }
+    Err("eth1 was not found!".into())
+}
+
+fn find_eth1() -> Option<pnet::datalink::NetworkInterface> {
+    let mut ifaces = pnet::datalink::interfaces();
+    ifaces.retain(|i| i.name == "eth1");
+    if !ifaces.is_empty() {
+        Some(ifaces[0].clone())
+    } else {
+        None
+    }
 }

From 262ce3f62799515264923dd8eca11b40d922752d Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 5 Sep 2017 18:37:26 -0700
Subject: [PATCH 45/71] cargo: move to published openssh-keys package

this makes our dependencies more simple, since we can pull from a
crates.io package instead of the git repository.
---
 Cargo.lock                        | 88 +++++++++++++++----------------
 Cargo.toml                        |  2 +-
 src/lib.rs                        |  4 +-
 src/metadata.rs                   |  2 +-
 src/providers/azure/crypto/mod.rs |  2 +-
 src/providers/azure/mod.rs        |  2 +-
 6 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cf2384bd..e87d58ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,24 +5,24 @@ dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.155 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.157 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hostname 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssh-keys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-xml-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-term 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ssh-keys 0.1.0 (git+https://github.com/sdemos/ssh-keys)",
  "update-ssh-keys 0.1.0 (git+https://github.com/sdemos/update-ssh-keys-rs)",
  "users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -139,9 +139,9 @@ name = "cargo_metadata"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -176,16 +176,16 @@ dependencies = [
 
 [[package]]
 name = "clippy"
-version = "0.0.155"
+version = "0.0.157"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy_lints 0.0.155 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy_lints 0.0.157 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "clippy_lints"
-version = "0.0.155"
+version = "0.0.157"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "itertools 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -195,8 +195,8 @@ dependencies = [
  "quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -308,7 +308,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "getopts"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -596,6 +596,17 @@ dependencies = [
  "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "openssh-keys"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "openssl"
 version = "0.9.17"
@@ -665,7 +676,7 @@ version = "0.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -721,8 +732,8 @@ dependencies = [
  "libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -833,7 +844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -842,13 +853,13 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -867,13 +878,13 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -883,7 +894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -934,17 +945,6 @@ name = "smallvec"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "ssh-keys"
-version = "0.1.0"
-source = "git+https://github.com/sdemos/ssh-keys#3c6162c640ae8d418ad61898bb02bdab53fe0998"
-dependencies = [
- "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "strsim"
 version = "0.6.0"
@@ -1145,7 +1145,7 @@ name = "toml"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1200,12 +1200,12 @@ dependencies = [
 [[package]]
 name = "update-ssh-keys"
 version = "0.1.0"
-source = "git+https://github.com/sdemos/update-ssh-keys-rs#c60b09ecbf3d6e843091dc4fb9ac9b034242f019"
+source = "git+https://github.com/sdemos/update-ssh-keys-rs#309aafafdb382d60c43fc42017a2f9225db56fb3"
 dependencies = [
  "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ssh-keys 0.1.0 (git+https://github.com/sdemos/ssh-keys)",
+ "openssh-keys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1303,8 +1303,8 @@ dependencies = [
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
 "checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
 "checksum clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0"
-"checksum clippy 0.0.155 (registry+https://github.com/rust-lang/crates.io-index)" = "03ba983d61af163f1b3ccc31cf1eb4925e62264bdfdc4b6b7f2d8fa6b7cd30ec"
-"checksum clippy_lints 0.0.155 (registry+https://github.com/rust-lang/crates.io-index)" = "315166a7e8c0fa313d852dd9d156857ffdfd40aad7989df4b2035970a1a31f6a"
+"checksum clippy 0.0.157 (registry+https://github.com/rust-lang/crates.io-index)" = "97ed8737240be5336d4a93927b43b74ae026a0e212e8886ddacb1a634706efcf"
+"checksum clippy_lints 0.0.157 (registry+https://github.com/rust-lang/crates.io-index)" = "15a01dcefcffa4d32138d950ef6c971ef0900252f5453acc23e9724c10730a0b"
 "checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
 "checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
 "checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
@@ -1320,7 +1320,7 @@ dependencies = [
 "checksum futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a82bdc62350ca9d7974c760e9665102fc9d740992a528c2254aa930e53b783c4"
 "checksum futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a283c84501e92cade5ea673a2a7ca44f71f209ccdd302a3e0896f50083d2c5ff"
 "checksum gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)" = "e8310f7e9c890398b0e80e301c4f474e9918d2b27fca8f48486ca775fa9ffc5a"
-"checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685"
+"checksum getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "65922871abd2f101a2eb0eaebadc66668e54a87ad9c3dd82520b5f86ede5eff9"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum hostname 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d865f01509e69c001c31b8c341607d93caef4ecf6836ffee39a1702430147943"
 "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
@@ -1354,6 +1354,7 @@ dependencies = [
 "checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
 "checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0"
 "checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584"
+"checksum openssh-keys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "43c57783fd85fe856d53f0ef17d30f5a23ad9faa34511ad9a09456b96f71c7c2"
 "checksum openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "085aaedcc89a2fac1eb2bc19cd66f29d4ea99fec60f82a5f3a88a6be7dbd90b5"
 "checksum openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7e3a9845a4c9fdb321931868aae5549e96bb7b979bf9af7de03603d74691b5f3"
 "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356"
@@ -1382,11 +1383,11 @@ dependencies = [
 "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
 "checksum semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f7726f29ddf9731b17ff113c461e362c381d9d69433f79de4f3dd572488823e9"
+"checksum serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "7f61b753dd58ec5d4c735f794dbddde1f28b977f652afbcde89d75bc77902216"
 "checksum serde-xml-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c06881f4313eec67d4ecfcd8e14339f6042cfc0de4b1bd3ceae74c29d597f68"
-"checksum serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cf823e706be268e73e7747b147aa31c8f633ab4ba31f115efb57e5047c3a76dd"
+"checksum serde_derive 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "2a169fa5384d751ada1da9f3992b81830151a03c875e40dcb37c9fb31aafc68f"
 "checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a"
-"checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b"
+"checksum serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d243424e06f9f9c39e3cd36147470fd340db785825e367625f79298a6ac6b7ac"
 "checksum serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce0fd303af908732989354c6f02e05e2e6d597152870f2c6990efb0577137480"
 "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
 "checksum slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "64b6be37712e0980c6d16ab1dbea3df868857883f4464f7ec1e37db8999ee9f3"
@@ -1394,7 +1395,6 @@ dependencies = [
 "checksum slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd3236e1818c147ed3003930289dc6457425aaca3a7dbb6b7f3032f075d865c5"
 "checksum slog-term 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b4dc32ad4eb5c7406c9aa333731803977fc962906af7e6f30ee9ccccc02076f"
 "checksum smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013"
-"checksum ssh-keys 0.1.0 (git+https://github.com/sdemos/ssh-keys)" = "<none>"
 "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
diff --git a/Cargo.toml b/Cargo.toml
index 6c4d9db7..30f163ed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ pnet = "0.19"
 reqwest = "0.7"
 hyper = "0.11"
 error-chain = "0.10"
-ssh-keys = { git = "https://github.com/sdemos/ssh-keys" }
+openssh-keys = "0.1"
 update-ssh-keys = { git = "https://github.com/sdemos/update-ssh-keys-rs" }
 ipnetwork = "0.12"
 clippy = { version = "*", optional = true }
diff --git a/src/lib.rs b/src/lib.rs
index 58abee60..28538762 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -38,7 +38,7 @@ extern crate serde_json;
 extern crate pnet;
 
 extern crate openssl;
-extern crate ssh_keys;
+extern crate openssh_keys;
 extern crate update_ssh_keys;
 
 extern crate users;
@@ -57,7 +57,7 @@ mod util;
 pub mod errors {
     error_chain!{
         links {
-            PublicKey(::ssh_keys::errors::Error, ::ssh_keys::errors::ErrorKind);
+            PublicKey(::openssh_keys::errors::Error, ::openssh_keys::errors::ErrorKind);
             AuthorizedKeys(::update_ssh_keys::errors::Error, ::update_ssh_keys::errors::ErrorKind);
         }
         foreign_links {
diff --git a/src/metadata.rs b/src/metadata.rs
index a9c9066e..7511227d 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -18,7 +18,7 @@ use std::path::Path;
 use std::io::prelude::*;
 use std::collections::HashMap;
 use users;
-use ssh_keys::PublicKey;
+use openssh_keys::PublicKey;
 use update_ssh_keys::AuthorizedKeys;
 use network;
 
diff --git a/src/providers/azure/crypto/mod.rs b/src/providers/azure/crypto/mod.rs
index a2c7e987..90c5fc35 100644
--- a/src/providers/azure/crypto/mod.rs
+++ b/src/providers/azure/crypto/mod.rs
@@ -21,7 +21,7 @@ use openssl::pkey::PKey;
 use openssl::cms::CmsContentInfo;
 use openssl::pkcs12::Pkcs12;
 
-use ssh_keys::PublicKey;
+use openssh_keys::PublicKey;
 
 use errors::*;
 
diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index 1f9a781f..f7d24e47 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -21,7 +21,7 @@ use errors::*;
 use metadata::Metadata;
 use pnet;
 use retry;
-use ssh_keys::PublicKey;
+use openssh_keys::PublicKey;
 
 use std::net::{IpAddr, Ipv4Addr};
 use std::fs::File;

From 5dcf6bcf37986d3414b6079d02e37f16a7a2324a Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Wed, 20 Sep 2017 15:32:23 -0700
Subject: [PATCH 46/71] cargo: bump dependencies

update to the newest patch versions of all our dependencies, in
particular, openssh-keys
---
 Cargo.lock | 353 +++++++++++++++++++++++++++--------------------------
 Cargo.toml |   2 +-
 src/lib.rs |   1 -
 3 files changed, 183 insertions(+), 173 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e87d58ab..a8f59e7c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,22 +4,22 @@ version = "0.1.0"
 dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.157 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.162 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hostname 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssh-keys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssh-keys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-xml-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-term 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -69,33 +69,10 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "backtrace"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "backtrace-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "backtrace-sys"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "base64"
 version = "0.6.0"
@@ -120,6 +97,20 @@ name = "bitflags"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "block-buffer"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "byte-tools"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "1.1.0"
@@ -139,11 +130,16 @@ name = "cargo_metadata"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "cc"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "cfg-if"
 version = "0.1.2"
@@ -160,7 +156,7 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.26.0"
+version = "2.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -168,35 +164,34 @@ dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "textwrap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "clippy"
-version = "0.0.157"
+version = "0.0.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy_lints 0.0.157 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy_lints 0.0.162 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "clippy_lints"
-version = "0.0.157"
+version = "0.0.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "itertools 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "pulldown-cmark 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -215,7 +210,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -223,7 +218,7 @@ name = "core-foundation-sys"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -246,12 +241,11 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "dbghelp-sys"
-version = "0.2.0"
+name = "digest"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -266,11 +260,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "error-chain"
-version = "0.10.0"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fake-simd"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "backtrace 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "foreign-types"
@@ -283,28 +279,32 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "futures"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "futures-cpupool"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "gcc"
-version = "0.3.53"
+name = "generic-array"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typenum 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "getopts"
@@ -321,7 +321,7 @@ name = "hostname"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winutil 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -337,12 +337,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -357,7 +357,7 @@ name = "hyper-tls"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -381,13 +381,13 @@ name = "iovec"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ipnetwork"
-version = "0.12.6"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -396,13 +396,13 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -410,7 +410,7 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -448,7 +448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.30"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -492,12 +492,12 @@ name = "memchr"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "mime"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -511,7 +511,7 @@ dependencies = [
  "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -537,7 +537,7 @@ name = "native-tls"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "schannel 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -551,11 +551,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "nodrop"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num"
 version = "0.1.40"
@@ -593,39 +601,44 @@ name = "num_cpus"
 version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "odds"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "openssh-keys"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "openssl"
-version = "0.9.17"
+version = "0.9.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.17"
+version = "0.9.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -646,8 +659,8 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet_macros_support 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -694,7 +707,7 @@ name = "rand"
 version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -726,13 +739,13 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -741,23 +754,6 @@ dependencies = [
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rust-crypto"
-version = "0.2.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "rustc-serialize"
 version = "0.3.24"
@@ -811,7 +807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -821,7 +817,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -844,7 +840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.12"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -853,23 +849,23 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.12"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive_internals 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive_internals"
-version = "0.15.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -882,9 +878,9 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -893,11 +889,23 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "block-buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "slab"
 version = "0.3.0"
@@ -905,7 +913,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "slog"
-version = "2.0.9"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -913,7 +921,7 @@ name = "slog-async"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "take_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -925,7 +933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -935,7 +943,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -982,7 +990,7 @@ name = "syntex_errors"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1004,7 +1012,7 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1046,13 +1054,13 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "textwrap"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1074,7 +1082,7 @@ version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1085,7 +1093,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1100,7 +1108,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1109,7 +1117,7 @@ name = "tokio-proto"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1126,7 +1134,7 @@ name = "tokio-service"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1134,7 +1142,7 @@ name = "tokio-tls"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1145,9 +1153,14 @@ name = "toml"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "typenum"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicase"
 version = "2.0.0"
@@ -1169,11 +1182,6 @@ name = "unicode-normalization"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "unicode-width"
 version = "0.1.4"
@@ -1200,12 +1208,12 @@ dependencies = [
 [[package]]
 name = "update-ssh-keys"
 version = "0.1.0"
-source = "git+https://github.com/sdemos/update-ssh-keys-rs#309aafafdb382d60c43fc42017a2f9225db56fb3"
+source = "git+https://github.com/sdemos/update-ssh-keys-rs#4d2668e08e8fd55ffbfe1bc63bd60c868fb251db"
 dependencies = [
- "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssh-keys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssh-keys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1224,7 +1232,7 @@ name = "users"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1291,35 +1299,37 @@ dependencies = [
 "checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
 "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
 "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
-"checksum backtrace 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "99f2ce94e22b8e664d95c57fff45b98a966c2252b60691d0b7aeeccd88d70983"
-"checksum backtrace-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "afccc5772ba333abccdf60d55200fa3406f8c59dcf54d5f7998c9107d3799c7c"
 "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
 "checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
+"checksum block-buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1339a1042f5d9f295737ad4d9a6ab6bf81c84a933dba110b9200cd6d1448b814"
+"checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
 "checksum byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d"
 "checksum bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d828f97b58cc5de3e40c421d0cf2132d6b2da4ee0e11b8632fa838f0f9333ad6"
 "checksum cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "be1057b8462184f634c3a208ee35b0f935cfd94b694b26deadccd98732088d7b"
+"checksum cc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7db2f146208d7e0fbee761b09cd65a7f51ccc38705d4e7262dad4d73b12a76b1"
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
 "checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
-"checksum clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0"
-"checksum clippy 0.0.157 (registry+https://github.com/rust-lang/crates.io-index)" = "97ed8737240be5336d4a93927b43b74ae026a0e212e8886ddacb1a634706efcf"
-"checksum clippy_lints 0.0.157 (registry+https://github.com/rust-lang/crates.io-index)" = "15a01dcefcffa4d32138d950ef6c971ef0900252f5453acc23e9724c10730a0b"
+"checksum clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3451e409013178663435d6f15fdb212f14ee4424a3d74f979d081d0a66b6f1f2"
+"checksum clippy 0.0.162 (registry+https://github.com/rust-lang/crates.io-index)" = "fcdb42cab913b8eb5d390ba612400ec581813fb59af29afd39333d7a550f332c"
+"checksum clippy_lints 0.0.162 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c0da7936c88883ac09bc3b29584c275551eff961b2d0d87a22b60205088e55"
 "checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
 "checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
 "checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
 "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
 "checksum crypt32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e34988f7e069e0b2f3bfc064295161e489b2d4e04a2e4248fb94360cdf00b4ec"
 "checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
-"checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
+"checksum digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e5b29bf156f3f4b3c4f610a25ff69370616ae6e0657d416de22645483e72af0a"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
 "checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a"
-"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
+"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
+"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
 "checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
-"checksum futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a82bdc62350ca9d7974c760e9665102fc9d740992a528c2254aa930e53b783c4"
-"checksum futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a283c84501e92cade5ea673a2a7ca44f71f209ccdd302a3e0896f50083d2c5ff"
-"checksum gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)" = "e8310f7e9c890398b0e80e301c4f474e9918d2b27fca8f48486ca775fa9ffc5a"
+"checksum futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "05a23db7bd162d4e8265968602930c476f688f0c180b44bdaf55e0cb2c687558"
+"checksum futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "77d49e7de8b91b20d6fda43eea906637eff18b96702eb6b2872df8bfab1ad2b5"
+"checksum generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fceb69994e330afed50c93524be68c42fa898c2d9fd4ee8da03bd7363acd26f2"
 "checksum getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "65922871abd2f101a2eb0eaebadc66668e54a87ad9c3dd82520b5f86ede5eff9"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum hostname 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d865f01509e69c001c31b8c341607d93caef4ecf6836ffee39a1702430147943"
@@ -1328,35 +1338,37 @@ dependencies = [
 "checksum hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c81fa95203e2a6087242c38691a0210f23e9f3f8f944350bd676522132e2985"
 "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
 "checksum iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29d062ee61fccdf25be172e70f34c9f6efc597e1fb8f6526e8437b2046ab26be"
-"checksum ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)" = "232e76922883005380e831068f731ef0305541c9f77b30df3a1635047b16f370"
+"checksum ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)" = "2134e210e2a024b5684f90e1556d5f71a1ce7f8b12e9ac9924c67fb36f63b336"
 "checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
-"checksum itertools 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "22c285d60139cf413244894189ca52debcfd70b57966feed060da76802e415a0"
-"checksum itoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ac17257442c2ed77dbc9fd555cf83c58b0c7f7d0e8f2ae08c0ac05c72842e1f6"
+"checksum itertools 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ab4d6a273c31ef276c917019239588b23bc696f277af8db10742cba3c27ec2f0"
+"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
 "checksum kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e014dab1082fd9d80ea1fa6fcb261b47ed3eb511612a14198bb507701add083e"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
 "checksum lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b585b7a6811fb03aa10e74b278a0f00f8dd9b45dc681f148bb29fa5cb61859b"
-"checksum libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)" = "2370ca07ec338939e356443dac2296f581453c35fe1e3a3ed06023c49435f915"
+"checksum libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "d1419b2939a0bc44b77feb34661583c7546b532b192feab36249ab584b86856c"
 "checksum libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "a2aa04ec0100812d31a5366130ff9e793291787bc31da845bede4a00ea329830"
 "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
 "checksum magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf0336886480e671965f794bc9b6fce88503563013d1bfb7a502c81fe3ac527"
 "checksum magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40d014c7011ac470ae28e2f76a02bfea4a8480f73e701353b49ad7a8d75f4699"
 "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
 "checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
-"checksum mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "153f98dde2b135dece079e5478ee400ae1bab13afa52d66590eacfc40e912435"
+"checksum mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e3d709ffbb330e1566dc2f2a3c9b58a5ad4a381f740b810cd305dc3f089bc160"
 "checksum mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "dbd91d3bfbceb13897065e97b2ef177a09a438cb33612b2d371bf568819a9313"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 "checksum native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04b781c9134a954c84f0594b9ab3f5606abc516030388e8511887ef4c204a1e5"
 "checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
+"checksum nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "52cd74cd09beba596430cc6e3091b74007169a56246e1262f0ba451ea95117b2"
 "checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525"
 "checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba"
 "checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
 "checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0"
 "checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584"
-"checksum openssh-keys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "43c57783fd85fe856d53f0ef17d30f5a23ad9faa34511ad9a09456b96f71c7c2"
-"checksum openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "085aaedcc89a2fac1eb2bc19cd66f29d4ea99fec60f82a5f3a88a6be7dbd90b5"
-"checksum openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7e3a9845a4c9fdb321931868aae5549e96bb7b979bf9af7de03603d74691b5f3"
+"checksum odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "c3df9b730298cea3a1c3faa90b7e2f9df3a9c400d0936d6015e6165734eefcba"
+"checksum openssh-keys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8f31cb7293e2394b3052cd6efd6a516c261888d0ac9856059db6fed9ca567781"
+"checksum openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "816914b22eb15671d62c73442a51978f311e911d6a6f6cbdafa6abce1b5038fc"
+"checksum openssl-sys 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4c63a7d559c1e5afa6d6a9e6fa34bbc5f800ffc9ae08b72c605420b0c4f5e8"
 "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356"
 "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
 "checksum pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d0364bc9319e77afb74fa65f6c8b0d73b1d3208f289cd227678f10562730791"
@@ -1370,8 +1382,6 @@ dependencies = [
 "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
 "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
 "checksum reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5866613d84e2a39c0479a960bf2d0eff1fbfc934f02cd42b5c08c1e1efc5b1fd"
-"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
-"checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
 "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
@@ -1383,14 +1393,15 @@ dependencies = [
 "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
 "checksum semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "7f61b753dd58ec5d4c735f794dbddde1f28b977f652afbcde89d75bc77902216"
+"checksum serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "6a7046c9d4c6c522d10b2d098f9bebe2bef227e0e74044d8c1bfcf6b476af799"
 "checksum serde-xml-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c06881f4313eec67d4ecfcd8e14339f6042cfc0de4b1bd3ceae74c29d597f68"
-"checksum serde_derive 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "2a169fa5384d751ada1da9f3992b81830151a03c875e40dcb37c9fb31aafc68f"
-"checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a"
+"checksum serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "1afcaae083fd1c46952a315062326bc9957f182358eb7da03b57ef1c688f7aa9"
+"checksum serde_derive_internals 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd381f6d01a6616cdba8530492d453b7761b456ba974e98768a18cad2cd76f58"
 "checksum serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d243424e06f9f9c39e3cd36147470fd340db785825e367625f79298a6ac6b7ac"
 "checksum serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce0fd303af908732989354c6f02e05e2e6d597152870f2c6990efb0577137480"
+"checksum sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d963c78ce367df26d7ea8b8cc655c651b42e8a1e584e869c1e17dae3ccb116a"
 "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
-"checksum slog 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "64b6be37712e0980c6d16ab1dbea3df868857883f4464f7ec1e37db8999ee9f3"
+"checksum slog 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "717c886b5e7855cf2e434a2d73ff494d33aaa584fb48e3074affc7b66dcd290d"
 "checksum slog-async 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ad0c2eeab552a206f95303868338aa67041146da8f8978dba8343c2b29b8ec2"
 "checksum slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd3236e1818c147ed3003930289dc6457425aaca3a7dbb6b7f3032f075d865c5"
 "checksum slog-term 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b4dc32ad4eb5c7406c9aa333731803977fc962906af7e6f30ee9ccccc02076f"
@@ -1407,7 +1418,7 @@ dependencies = [
 "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
-"checksum textwrap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f728584ea33b0ad19318e20557cb0a39097751dbb07171419673502f848c7af6"
+"checksum textwrap 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8e08afc40ae3459e4838f303e465aa50d823df8d7f83ca88108f6d3afe7edd"
 "checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
 "checksum time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d788d3aa77bc0ef3e9621256885555368b47bd495c13dd2e7413c89f845520"
 "checksum tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e85d419699ec4b71bfe35bbc25bb8771e52eff0471a7f75c853ad06e200b4f86"
@@ -1416,10 +1427,10 @@ dependencies = [
 "checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
 "checksum tokio-tls 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d88e411cac1c87e405e4090be004493c5d8072a370661033b1a64ea205ec2e13"
 "checksum toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e"
+"checksum typenum 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "13a99dc6780ef33c78780b826cf9d2a78840b72cae9474de4bcaf9051e60ebbd"
 "checksum unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e01da42520092d0cd2d6ac3ae69eb21a22ad43ff195676b86f8c37f487d6b80"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
-"checksum unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946"
 "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
 "checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
 "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
diff --git a/Cargo.toml b/Cargo.toml
index 30f163ed..ee41017c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ byteorder = "1.1"
 pnet = "0.19"
 reqwest = "0.7"
 hyper = "0.11"
-error-chain = "0.10"
+error-chain = { version = "0.11", default-features = false }
 openssh-keys = "0.1"
 update-ssh-keys = { git = "https://github.com/sdemos/update-ssh-keys-rs" }
 ipnetwork = "0.12"
diff --git a/src/lib.rs b/src/lib.rs
index 28538762..4b05e288 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -53,7 +53,6 @@ mod network;
 mod retry;
 mod util;
 
-#[allow(unused_doc_comment)]
 pub mod errors {
     error_chain!{
         links {

From c35d51cd008e122bb410f6bfb07638dfdde5ca04 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Thu, 21 Sep 2017 15:27:03 -0700
Subject: [PATCH 47/71] cargo: bump update-ssh-keys version

the update-ssh-keys library was working around a bug in rust-users
relating to user switching. we update to the newest version of that
package now that the upstream bug is resolved.
---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index a8f59e7c..7d9381ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1208,7 +1208,7 @@ dependencies = [
 [[package]]
 name = "update-ssh-keys"
 version = "0.1.0"
-source = "git+https://github.com/sdemos/update-ssh-keys-rs#4d2668e08e8fd55ffbfe1bc63bd60c868fb251db"
+source = "git+https://github.com/sdemos/update-ssh-keys-rs#2fa0c4f51bdd9deb0237fd3425d8477d3f17dee6"
 dependencies = [
  "clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",

From a05ba55e1e4510285b990bc2e2f4e4c5815bad5c Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Thu, 21 Sep 2017 18:06:32 -0700
Subject: [PATCH 48/71] cargo: bump openssh-keys and update-ssh-keys

there were some bug fixes and additional features in the openssh-keys
and update-ssh-keys libraries, so get the latest versions of those
packages.
---
 Cargo.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7d9381ea..26013dcd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,7 +11,7 @@ dependencies = [
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssh-keys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssh-keys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -611,7 +611,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "openssh-keys"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1208,12 +1208,12 @@ dependencies = [
 [[package]]
 name = "update-ssh-keys"
 version = "0.1.0"
-source = "git+https://github.com/sdemos/update-ssh-keys-rs#2fa0c4f51bdd9deb0237fd3425d8477d3f17dee6"
+source = "git+https://github.com/sdemos/update-ssh-keys-rs#7f78b1f83c043ca1ddf42772cb548767b8f561ea"
 dependencies = [
  "clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssh-keys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssh-keys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1366,7 +1366,7 @@ dependencies = [
 "checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0"
 "checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584"
 "checksum odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "c3df9b730298cea3a1c3faa90b7e2f9df3a9c400d0936d6015e6165734eefcba"
-"checksum openssh-keys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8f31cb7293e2394b3052cd6efd6a516c261888d0ac9856059db6fed9ca567781"
+"checksum openssh-keys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a1af844e3f3f7742b5a8edbc0e5af0fe4b3a0b4172f6ec0c261fed74765dde8c"
 "checksum openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "816914b22eb15671d62c73442a51978f311e911d6a6f6cbdafa6abce1b5038fc"
 "checksum openssl-sys 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4c63a7d559c1e5afa6d6a9e6fa34bbc5f800ffc9ae08b72c605420b0c4f5e8"
 "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356"

From 97aa76da02e2383b00afb5682d38a269c7b38779 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Mon, 25 Sep 2017 15:44:38 +0000
Subject: [PATCH 49/71] providers/ec2: add HTTP mock tests

this allows us to be more confident about the rewrite. right now, this
is only implemented for some basic assumptions about the behavior of ssh
key fetching for ec2, but the intention is to eventually expand this to
cover all providers over time.
---
 Cargo.lock                      | 30 +++++++++++++++++++++++++++++
 Cargo.toml                      |  3 +++
 src/lib.rs                      |  2 ++
 src/providers/ec2/mock_tests.rs | 34 +++++++++++++++++++++++++++++++++
 src/providers/ec2/mod.rs        | 12 +++++++++---
 5 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 src/providers/ec2/mock_tests.rs

diff --git a/Cargo.lock b/Cargo.lock
index 26013dcd..d8dac24a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,6 +11,7 @@ dependencies = [
  "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mockito 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssh-keys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -297,6 +298,11 @@ dependencies = [
  "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "gcc"
+version = "0.3.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "generic-array"
 version = "0.8.3"
@@ -325,6 +331,15 @@ dependencies = [
  "winutil 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "http-muncher"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "httparse"
 version = "1.2.3"
@@ -532,6 +547,18 @@ dependencies = [
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "mockito"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "http-muncher 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.1.4"
@@ -1329,10 +1356,12 @@ dependencies = [
 "checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
 "checksum futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "05a23db7bd162d4e8265968602930c476f688f0c180b44bdaf55e0cb2c687558"
 "checksum futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "77d49e7de8b91b20d6fda43eea906637eff18b96702eb6b2872df8bfab1ad2b5"
+"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
 "checksum generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fceb69994e330afed50c93524be68c42fa898c2d9fd4ee8da03bd7363acd26f2"
 "checksum getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "65922871abd2f101a2eb0eaebadc66668e54a87ad9c3dd82520b5f86ede5eff9"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum hostname 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d865f01509e69c001c31b8c341607d93caef4ecf6836ffee39a1702430147943"
+"checksum http-muncher 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f0d8b98946459faf4fdfdf6d90e9aac08967b9b9ffe67005d2b1f99115da741"
 "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
 "checksum hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "641abc3e3fcf0de41165595f801376e01106bca1fd876dda937730e477ca004c"
 "checksum hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c81fa95203e2a6087242c38691a0210f23e9f3f8f944350bd676522132e2985"
@@ -1357,6 +1386,7 @@ dependencies = [
 "checksum mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e3d709ffbb330e1566dc2f2a3c9b58a5ad4a381f740b810cd305dc3f089bc160"
 "checksum mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "dbd91d3bfbceb13897065e97b2ef177a09a438cb33612b2d371bf568819a9313"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+"checksum mockito 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c1b79c374f7fb89af61c1d49086c824a1c2abe9cfcfe6b182980959b70fb4b4a"
 "checksum native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04b781c9134a954c84f0594b9ab3f5606abc516030388e8511887ef4c204a1e5"
 "checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
 "checksum nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "52cd74cd09beba596430cc6e3091b74007169a56246e1262f0ba451ea95117b2"
diff --git a/Cargo.toml b/Cargo.toml
index ee41017c..66d43d3a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,6 +31,9 @@ hostname = "0.1"
 version = "*"
 features = ["max_level_trace"]
 
+[dev-dependencies]
+mockito = "0.9"
+
 [features]
 default = []
 lints = ["clippy"]
diff --git a/src/lib.rs b/src/lib.rs
index 4b05e288..d71e0d29 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,6 +18,8 @@
 #[macro_use]
 extern crate hyper;
 extern crate reqwest;
+#[cfg(test)]
+extern crate mockito;
 
 extern crate base64;
 
diff --git a/src/providers/ec2/mock_tests.rs b/src/providers/ec2/mock_tests.rs
new file mode 100644
index 00000000..cea3d72d
--- /dev/null
+++ b/src/providers/ec2/mock_tests.rs
@@ -0,0 +1,34 @@
+use mockito;
+use errors::*;
+use providers::ec2;
+
+pub(crate) const URL: &'static str = ::mockito::SERVER_URL;
+
+#[test]
+fn test_ec2_basic() {
+    let ep = "/meta-data/public-keys";
+    let client = ::retry::Client::new()
+        .chain_err(|| "failed to create http client")
+        .unwrap()
+        .max_attempts(1)
+        .return_on_404(true);
+
+    ec2::fetch_ssh_keys(&client).unwrap_err();
+
+    let _m = mockito::mock("GET", ep)
+        .with_status(503)
+        .create();
+    ec2::fetch_ssh_keys(&client).unwrap_err();
+
+    let _m = mockito::mock("GET", ep)
+        .with_status(200)
+        .create();
+    let v = ec2::fetch_ssh_keys(&client).unwrap();
+    assert_eq!(v.len(), 0);
+
+    let _m = mockito::mock("GET", ep)
+        .with_status(404)
+        .create();
+    let v = ec2::fetch_ssh_keys(&client).unwrap();
+    assert_eq!(v.len(), 0);
+}
diff --git a/src/providers/ec2/mod.rs b/src/providers/ec2/mod.rs
index cb56dfb0..c9b12880 100644
--- a/src/providers/ec2/mod.rs
+++ b/src/providers/ec2/mod.rs
@@ -14,14 +14,20 @@
 
 //! aws ec2 metadata fetcher
 //!
+use errors::*;
+use metadata::Metadata;
 use retry;
 
-use metadata::Metadata;
+#[cfg(test)]
+mod mock_tests;
+#[cfg(test)]
+use self::mock_tests::URL;
 
-use errors::*;
+#[cfg(not(test))]
+const URL: &'static str = "http://169.254.169.254/2009-04-04";
 
 fn url_for_key(key: &str) -> String {
-    format!("http://169.254.169.254/2009-04-04/{}", key)
+    format!("{}/{}", URL, key)
 }
 
 #[allow(non_snake_case)]

From 367cbbe03bebadf36f6fcccb866b71001fe21534 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Mon, 25 Sep 2017 14:32:44 -0700
Subject: [PATCH 50/71] util: add key_lookup_reader function

most of the time that a key is looked up, it is from a file. we make a
function that is generic over readers so that we don't have to manually
read the contents of the file everytime we want to get a key from it.
---
 src/providers/packet/mod.rs |  8 ++------
 src/util/mod.rs             | 40 +++++++++++++++++++++++++++----------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/providers/packet/mod.rs b/src/providers/packet/mod.rs
index 442bf9b7..078fdc70 100644
--- a/src/providers/packet/mod.rs
+++ b/src/providers/packet/mod.rs
@@ -20,7 +20,6 @@ use errors::*;
 
 use retry;
 use std::fs::File;
-use std::io::Read;
 use std::str::FromStr;
 
 use util;
@@ -102,11 +101,8 @@ pub fn fetch_metadata() -> Result<Metadata> {
 }
 
 fn get_dns_servers() -> Result<Vec<IpAddr>> {
-    let mut state = String::new();
-    let mut f = File::open("/run/systemd/netif/state")?;
-    f.read_to_string(&mut state)?;
-
-    let ip_strings = util::key_lookup('=', "DNS", &state)
+    let f = File::open("/run/systemd/netif/state")?;
+    let ip_strings = util::key_lookup_reader('=', "DNS", f)?
         .ok_or("DNS not found in netif state file")?;
     let mut addrs = Vec::new();
     for ip_string in ip_strings.split(' ') {
diff --git a/src/util/mod.rs b/src/util/mod.rs
index e8bb2bf4..f8face8d 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -14,18 +14,38 @@
 
 //! utility functions
 
+use std::io::{Read, BufRead, BufReader};
+use errors::*;
+
+fn key_lookup_line(delim: char, key: &str, line: &str) -> Option<String> {
+    match line.find(delim) {
+        Some(index) => {
+            let (k, val) = line.split_at(index+1);
+            if k != format!("{}{}", key, delim) {
+                return None
+            }
+            return Some(val.to_owned())
+        }
+        None => None,
+    }
+}
+
+pub fn key_lookup_reader<R: Read>(delim: char, key: &str, reader: R) -> Result<Option<String>> {
+    let contents = BufReader::new(reader);
+
+    for l in contents.lines() {
+        let l = l?;
+        if let Some(v) = key_lookup_line(delim, key, &l) {
+            return Ok(Some(v));
+        }
+    }
+    Ok(None)
+}
+
 pub fn key_lookup(delim: char, key: &str, contents: &str) -> Option<String> {
     for l in contents.lines() {
-        match l.find(delim) {
-            Some(index) => {
-                let l = l.to_owned();
-                let (k, val) = l.split_at(index+1);
-                if k != format!("{}{}", key, delim) {
-                    continue
-                }
-                return Some(val.to_owned())
-            }
-            None => continue,
+        if let Some(v) = key_lookup_line(delim, key, l) {
+            return Some(v)
         }
     }
     None

From 04bf48d5be58fa36c446fd686b933de33d85d129 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Thu, 21 Sep 2017 11:46:46 -0700
Subject: [PATCH 51/71] providers/azure: wait until dhcp lease is aquired

There was an issue with the golang version where it would sometimes run
before the dhcp lease was actually aquired, so it would fail to get the
ip address (coreos/coreos-metadata#26). Let's not make the same mistake.

I would prefer it if this was a backoff timer of some kind instead of
just looping forever, but for now, we are just going to do what the
golang implementation does.
---
 src/providers/azure/mod.rs | 68 +++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index f7d24e47..5c9d3794 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -23,10 +23,12 @@ use pnet;
 use retry;
 use openssh_keys::PublicKey;
 
-use std::net::{IpAddr, Ipv4Addr};
+use std::net::IpAddr;
 use std::fs::File;
 use std::path::Path;
 use std::io::{BufRead, BufReader};
+use std::time::Duration;
+use std::thread;
 
 header! {(MSAgentName, "x-ms-agent-name") => [String]}
 header! {(MSVersion, "x-ms-version") => [String]}
@@ -113,45 +115,49 @@ impl Azure {
         Ok(azure)
     }
 
-    // I don't really understand why this is how we need to get this ip
-    // address but this is how it works in the original implementation
-    // and nobody complains about it, so w/e
     fn get_fabric_address() -> Result<IpAddr> {
         // get the interfaces on the machine
         let interfaces = pnet::datalink::interfaces();
         trace!("interfaces - {:?}", interfaces);
 
-        for interface in interfaces {
-            trace!("looking at interface {:?}", interface);
-            let lease_path = format!("/run/systemd/netif/leases/{}", interface.index);
-            let lease_path = Path::new(&lease_path);
-            if lease_path.exists() {
-                debug!("found lease file - {:?}", lease_path);
-                let lease = File::open(&lease_path)
-                    .chain_err(|| format!("failed to open lease file ({:?})", lease_path))?;
-                let lease = BufReader::new(&lease);
-
-                // find the OPTION_245 flag
-                for line in lease.lines() {
-                    let line = line
-                        .chain_err(|| format!("failed to read from lease file ({:?})", lease_path))?;
-                    let option: Vec<&str> = line.split('=').collect();
-                    if option.len() > 1 && option[0] == OPTION_245 {
-                        // value is an 8 digit hex value. convert it to u32 and
-                        // then parse that into an ip. Ipv4Addr::from(u32)
-                        // performs conversion from big-endian
-                        trace!("found fabric address in hex - {:?}", option[1]);
-                        let dec = u32::from_str_radix(option[1], 16)
-                            .chain_err(|| format!("failed to convert '{}' from hex", option[1]))?;
-                        return Ok(IpAddr::V4(Ipv4Addr::from(dec)));
+        // if we don't find the dhcp lease, keep trying
+        // TODO(sdemos): eventually this should be a backoff timer instead of
+        // looping forever.
+        loop {
+            for interface in interfaces.clone() {
+                trace!("looking at interface {:?}", interface);
+                let lease_path = format!("/run/systemd/netif/leases/{}", interface.index);
+                let lease_path = Path::new(&lease_path);
+                if lease_path.exists() {
+                    debug!("found lease file - {:?}", lease_path);
+                    let lease = File::open(&lease_path)
+                        .chain_err(|| format!("failed to open lease file ({:?})", lease_path))?;
+                    let lease = BufReader::new(&lease);
+
+                    // find the OPTION_245 flag
+                    for line in lease.lines() {
+                        let line = line
+                            .chain_err(|| format!("failed to read from lease file ({:?})", lease_path))?;
+                        let option: Vec<&str> = line.split('=').collect();
+                        if option.len() > 1 && option[0] == OPTION_245 {
+                            // value is an 8 digit hex value. convert it to u32 and
+                            // then parse that into an ip. Ipv4Addr::from(u32)
+                            // performs conversion from big-endian
+                            trace!("found fabric address in hex - {:?}", option[1]);
+                            let dec = u32::from_str_radix(option[1], 16)
+                                .chain_err(|| format!("failed to convert '{}' from hex", option[1]))?;
+                            return Ok(IpAddr::V4(dec.into()));
+                        }
                     }
-                }
 
-                debug!("failed to get fabric address from existing lease file '{:?}'", lease_path);
+                    debug!("failed to get fabric address from existing lease file '{:?}'", lease_path);
+                }
             }
-        }
 
-        Err("failed to retrieve fabric address".into())
+            // sleep for a bit
+            thread::sleep(Duration::from_millis(500));
+        }
+        // Err("failed to retrieve fabric address".into())
     }
 
     fn is_fabric_compatible(&self, version: &str) -> Result<()> {

From dde22311cebc74a91f501a13e8d6ff8c6e2224b4 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Mon, 25 Sep 2017 15:32:21 -0700
Subject: [PATCH 52/71] util: add dhcp key lookup function

this function removes a lot of the work from providers that need to look
up this information and lets us only fix issues with the logic in one
place.

fixes #19
---
 src/providers/azure/mod.rs | 57 ++++++--------------------------------
 src/util/mod.rs            | 41 +++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index 5c9d3794..d808ed15 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -19,16 +19,11 @@ mod crypto;
 use self::crypto::x509;
 use errors::*;
 use metadata::Metadata;
-use pnet;
 use retry;
+use util;
 use openssh_keys::PublicKey;
 
 use std::net::IpAddr;
-use std::fs::File;
-use std::path::Path;
-use std::io::{BufRead, BufReader};
-use std::time::Duration;
-use std::thread;
 
 header! {(MSAgentName, "x-ms-agent-name") => [String]}
 header! {(MSVersion, "x-ms-version") => [String]}
@@ -116,48 +111,14 @@ impl Azure {
     }
 
     fn get_fabric_address() -> Result<IpAddr> {
-        // get the interfaces on the machine
-        let interfaces = pnet::datalink::interfaces();
-        trace!("interfaces - {:?}", interfaces);
-
-        // if we don't find the dhcp lease, keep trying
-        // TODO(sdemos): eventually this should be a backoff timer instead of
-        // looping forever.
-        loop {
-            for interface in interfaces.clone() {
-                trace!("looking at interface {:?}", interface);
-                let lease_path = format!("/run/systemd/netif/leases/{}", interface.index);
-                let lease_path = Path::new(&lease_path);
-                if lease_path.exists() {
-                    debug!("found lease file - {:?}", lease_path);
-                    let lease = File::open(&lease_path)
-                        .chain_err(|| format!("failed to open lease file ({:?})", lease_path))?;
-                    let lease = BufReader::new(&lease);
-
-                    // find the OPTION_245 flag
-                    for line in lease.lines() {
-                        let line = line
-                            .chain_err(|| format!("failed to read from lease file ({:?})", lease_path))?;
-                        let option: Vec<&str> = line.split('=').collect();
-                        if option.len() > 1 && option[0] == OPTION_245 {
-                            // value is an 8 digit hex value. convert it to u32 and
-                            // then parse that into an ip. Ipv4Addr::from(u32)
-                            // performs conversion from big-endian
-                            trace!("found fabric address in hex - {:?}", option[1]);
-                            let dec = u32::from_str_radix(option[1], 16)
-                                .chain_err(|| format!("failed to convert '{}' from hex", option[1]))?;
-                            return Ok(IpAddr::V4(dec.into()));
-                        }
-                    }
-
-                    debug!("failed to get fabric address from existing lease file '{:?}'", lease_path);
-                }
-            }
-
-            // sleep for a bit
-            thread::sleep(Duration::from_millis(500));
-        }
-        // Err("failed to retrieve fabric address".into())
+        let v = util::dns_lease_key_lookup(OPTION_245)?;
+        // value is an 8 digit hex value. convert it to u32 and
+        // then parse that into an ip. Ipv4Addr::from(u32)
+        // performs conversion from big-endian
+        trace!("found fabric address in hex - {:?}", v);
+        let dec = u32::from_str_radix(&v, 16)
+            .chain_err(|| format!("failed to convert '{}' from hex", v))?;
+        Ok(IpAddr::V4(dec.into()))
     }
 
     fn is_fabric_compatible(&self, version: &str) -> Result<()> {
diff --git a/src/util/mod.rs b/src/util/mod.rs
index f8face8d..6fe0e901 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -14,7 +14,12 @@
 
 //! utility functions
 
+use pnet;
 use std::io::{Read, BufRead, BufReader};
+use std::fs::File;
+use std::path::Path;
+use std::time::Duration;
+use std::thread;
 use errors::*;
 
 fn key_lookup_line(delim: char, key: &str, line: &str) -> Option<String> {
@@ -22,9 +27,10 @@ fn key_lookup_line(delim: char, key: &str, line: &str) -> Option<String> {
         Some(index) => {
             let (k, val) = line.split_at(index+1);
             if k != format!("{}{}", key, delim) {
-                return None
+                None
+            } else {
+                Some(val.to_owned())
             }
-            return Some(val.to_owned())
         }
         None => None,
     }
@@ -51,6 +57,37 @@ pub fn key_lookup(delim: char, key: &str, contents: &str) -> Option<String> {
     None
 }
 
+pub fn dns_lease_key_lookup(key: &str) -> Result<String> {
+    let interfaces = pnet::datalink::interfaces();
+    trace!("interfaces - {:?}", interfaces);
+
+    // if we don't find the dhcp lease, keep trying
+    // TODO(sdemos): eventually this should be a backoff timer instead of
+    // looping forever.
+    loop {
+        for interface in interfaces.clone() {
+            trace!("looking at interface {:?}", interface);
+            let lease_path = format!("/run/systemd/netif/leases/{}", interface.index);
+            let lease_path = Path::new(&lease_path);
+            if lease_path.exists() {
+                debug!("found lease file - {:?}", lease_path);
+                let lease = File::open(&lease_path)
+                    .chain_err(|| format!("failed to open lease file ({:?})", lease_path))?;
+
+                if let Some(v) = key_lookup_reader('=', key, lease)? {
+                    return Ok(v);
+                }
+
+                debug!("failed to get value from existing lease file '{:?}'", lease_path);
+            }
+        }
+
+        // sleep for a bit
+        thread::sleep(Duration::from_millis(500));
+    }
+    // Err("failed to retrieve fabric address".into())
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

From 26c8f99afa20f5abec02454a45b6db03db46ad7e Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 30 Aug 2017 16:34:36 -0700
Subject: [PATCH 53/71] providers/ec2: refactor fetch_ssh_keys

this simplifies the ec2 fetch_ssh_keys logic.
---
 src/providers/ec2/mod.rs | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/providers/ec2/mod.rs b/src/providers/ec2/mod.rs
index c9b12880..3748bcde 100644
--- a/src/providers/ec2/mod.rs
+++ b/src/providers/ec2/mod.rs
@@ -65,25 +65,17 @@ pub fn fetch_metadata() -> Result<Metadata> {
 
 fn fetch_ssh_keys(client: &retry::Client) -> Result<Vec<String>> {
     let keydata: Option<String> = client.get(retry::Raw, url_for_key("meta-data/public-keys")).send()?;
-    match keydata {
-        Some(s) => {
-            let mut res = Ok(Vec::new());
-            for keyname in s.split_whitespace() {
-                let tokens: Vec<&str> = keyname.split('=').collect();
-                if tokens.len() != 2 {
-                    res = Err("malformed public key".into());
-                    break;
-                }
-                let ssh_key: String = client.get(retry::Raw, url_for_key(&format!("meta-data/public-keys/{}/openssh-key", tokens[0]))).send()?
-                    .ok_or("missing ssh key")?;
-                if let Ok(keys) = res.as_mut() {
-                    keys.push(ssh_key);
-                }
+    let mut keys = Vec::new();
+    if let Some(keys_list) = keydata {
+        for l in keys_list.lines() {
+            let tokens: Vec<&str> = l.split('=').collect();
+            if tokens.len() != 2 {
+                return Err("error parsing keyID".into());
             }
-            res
-        }
-        None => {
-            Ok(Vec::new())
+            let key: String = client.get(retry::Raw, url_for_key(&format!("meta-data/public-keys/{}/openssh-key", tokens[0]))).send()?
+                    .ok_or("missing ssh key")?;
+            keys.push(key)
         }
     }
+    Ok(keys)
 }

From 55ebb105dd3b343d9c684ae120c60f2c670fdc72 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Wed, 27 Sep 2017 13:17:19 -0700
Subject: [PATCH 54/71] cargo: added bin declaration

For now we aren't exposing the library publicly, so don't let cargo try
and pull all that automatically.
---
 Cargo.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 66d43d3a..d2f4a924 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,10 @@ name = "coreos-metadata"
 version = "0.1.0"
 authors = ["Stephen Demos <stephen.demos@coreos.com>"]
 
+[[bin]]
+name = "coreos-metadata"
+path = "src/bin/coreos-metadata.rs"
+
 [dependencies]
 clap = "*"
 users = "*"

From 1a08d2a2ffd2e6bd8ab700f951ee3ebadab2570d Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 19 Sep 2017 13:47:41 -0700
Subject: [PATCH 55/71] providers/azure: added attribute support

the original implementation of the azure provider only got ssh-keys. we
need to make sure the library has complete feature parity with the
golang version.
---
 src/providers/azure/mod.rs | 103 +++++++++++++++++++++++++++++++++----
 1 file changed, 93 insertions(+), 10 deletions(-)

diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index d808ed15..c902dd69 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -23,7 +23,7 @@ use retry;
 use util;
 use openssh_keys::PublicKey;
 
-use std::net::IpAddr;
+use std::net::{IpAddr, SocketAddr};
 
 header! {(MSAgentName, "x-ms-agent-name") => [String]}
 header! {(MSVersion, "x-ms-version") => [String]}
@@ -68,7 +68,9 @@ struct RoleInstance {
 #[derive(Debug, Deserialize)]
 struct Configuration {
     #[serde(rename = "Certificates", default)]
-    pub certificates: String
+    pub certificates: String,
+    #[serde(rename = "SharedConfig", default)]
+    pub shared_config: String,
 }
 
 #[derive(Debug, Deserialize)]
@@ -89,6 +91,51 @@ struct Supported {
     pub versions: Vec<String>
 }
 
+#[derive(Debug, Deserialize)]
+struct SharedConfig {
+    #[serde(rename = "Incarnation")]
+    pub incarnation: Incarnation,
+    #[serde(rename = "Instances")]
+    pub instances: Instances,
+}
+
+#[derive(Debug, Deserialize)]
+struct Incarnation {
+    pub instance: String,
+}
+
+#[derive(Debug, Deserialize)]
+struct Instances {
+    #[serde(rename = "Instance", default)]
+    pub instances: Vec<Instance>,
+}
+
+#[derive(Debug, Deserialize)]
+struct Instance {
+    pub id: String,
+    pub address: String,
+    #[serde(rename = "InputEndpoints")]
+    pub input_endpoints: InputEndpoints,
+}
+
+#[derive(Debug, Deserialize)]
+struct InputEndpoints {
+    #[serde(rename = "Endpoint", default)]
+    pub endpoints: Vec<Endpoint>,
+}
+
+#[derive(Debug, Deserialize)]
+struct Endpoint {
+    #[serde(rename = "loadBalancedPublicAddress", default)]
+    pub load_balanced_public_address: String,
+}
+
+#[derive(Debug, Copy, Clone, Default)]
+struct Attributes {
+    pub virtual_ipv4: Option<IpAddr>,
+    pub dynamic_ipv4: Option<IpAddr>,
+}
+
 struct Azure {
     client: retry::Client,
     endpoint: IpAddr,
@@ -133,18 +180,25 @@ impl Azure {
         }
     }
 
-    fn get_certs_endpoint(&self) -> Result<String> {
-        let goalstate: GoalState = self.client.get(retry::Xml, format!("http://{}/machine/?comp=goalstate", self.endpoint)).send()
+    fn get_goal_state(&self) -> Result<GoalState> {
+        self.client.get(retry::Xml, format!("http://{}/machine/?comp=goalstate", self.endpoint)).send()
             .chain_err(|| "failed to get goal state")?
-            .ok_or_else(|| "failed to get goal state: not found response")?;
+            .ok_or_else(|| "failed to get goal state: not found response".into())
+    }
+
+    fn get_certs_endpoint(&self) -> Result<String> {
+        let goalstate = self.get_goal_state()?;
 
         // grab the certificates endpoint from the xml and return it
         let cert_endpoint: &str = &goalstate.container.role_instance_list.role_instances[0].configuration.certificates;
         Ok(String::from(cert_endpoint))
     }
 
-    fn get_certs(&self, endpoint: String, mangled_pem: String) -> Result<String> {
+    fn get_certs(&self, mangled_pem: String) -> Result<String> {
         // get the certificates
+        let endpoint = self.get_certs_endpoint()
+            .chain_err(|| "failed to get certs endpoint")?;
+
         let certs: CertificatesFile = self.client.get(retry::Xml, endpoint)
             .header(MSCipherName("DES_EDE3_CBC".to_owned()))
             .header(MSCert(mangled_pem))
@@ -163,9 +217,6 @@ impl Azure {
     // put it all together
     fn get_ssh_pubkey(&self) -> Result<PublicKey> {
         // first we have to get the certificates endoint.
-        let certs_endpoint = self.get_certs_endpoint()
-            .chain_err(|| "failed to get certs endpoint")?;
-
         // we have to generate the rsa public/private keypair and the x509 cert
         // that we use to make the request. this is equivalent to
         // `openssl req -x509 -nodes -subj /CN=LinuxTransport -days 365 -newkey rsa:2048 -keyout private.pem -out cert.pem`
@@ -177,7 +228,7 @@ impl Azure {
             .chain_err(|| "failed to mangle pem")?;
 
         // fetch the encrypted cms blob from the certs endpoint
-        let smime = self.get_certs(certs_endpoint, mangled_pem)
+        let smime = self.get_certs(mangled_pem)
             .chain_err(|| "failed to get certs")?;
 
         // decrypt the cms blob
@@ -190,6 +241,33 @@ impl Azure {
 
         Ok(ssh_pubkey)
     }
+
+    fn get_attributes(&self) -> Result<Attributes> {
+        let goalstate = self.get_goal_state()?;
+
+        let endpoint = &goalstate.container.role_instance_list.role_instances[0].configuration.shared_config;
+
+        let shared_config: SharedConfig = self.client.get(retry::Xml, endpoint.to_string()).send()
+            .chain_err(|| "failed to get shared configuration")?
+            .ok_or_else(|| "failed to get shared configuration: not found")?;
+
+        let mut attributes = Attributes::default();
+
+        for instance in shared_config.instances.instances {
+            if instance.id == shared_config.incarnation.instance {
+                attributes.dynamic_ipv4 = Some(instance.address.parse()
+                    .chain_err(|| format!("failed to parse instance ip address: {}", instance.address))?);
+                for endpoint in instance.input_endpoints.endpoints {
+                    attributes.virtual_ipv4 = match endpoint.load_balanced_public_address.parse::<SocketAddr>() {
+                        Ok(lbpa) => Some(lbpa.ip()),
+                        Err(_) => continue,
+                    };
+                }
+            }
+        }
+
+        Ok(attributes)
+    }
 }
 
 pub fn fetch_metadata() -> Result<Metadata> {
@@ -199,7 +277,12 @@ pub fn fetch_metadata() -> Result<Metadata> {
     let ssh_pubkey = provider.get_ssh_pubkey()
         .chain_err(|| "azure: failed to get ssh pubkey")?;
 
+    let attributes = provider.get_attributes()
+        .chain_err(|| "azure: failed to get attributes")?;
+
     Ok(Metadata::builder()
        .add_publickeys(vec![ssh_pubkey])
+       .add_attribute_if_exists("AZURE_IPV4_DYNAMIC".to_string(), attributes.dynamic_ipv4.map(|x| x.to_string()))
+       .add_attribute_if_exists("AZURE_IPV4_VIRTUAL".to_string(), attributes.virtual_ipv4.map(|x| x.to_string()))
        .build())
 }

From a52298666a50b194fe019b4f543c6f312de5f77b Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Thu, 21 Sep 2017 11:24:36 -0700
Subject: [PATCH 56/71] providers/azure: only fetch goalstate once

this reduces the number of network calls we need to get the metadata,
and also makes sure we are always working off the same information. also
adds various derivations for structs.
---
 src/providers/azure/mod.rs | 61 +++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/providers/azure/mod.rs b/src/providers/azure/mod.rs
index c902dd69..49f7b979 100644
--- a/src/providers/azure/mod.rs
+++ b/src/providers/azure/mod.rs
@@ -41,31 +41,31 @@ Content-Transfer-Encoding: base64
 
 ";
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone, Default)]
 struct GoalState {
     #[serde(rename = "Container")]
     pub container: Container
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone, Default)]
 struct Container {
     #[serde(rename = "RoleInstanceList")]
     pub role_instance_list: RoleInstanceList
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone, Default)]
 struct RoleInstanceList {
-    #[serde(rename = "RoleInstance")]
+    #[serde(rename = "RoleInstance", default)]
     pub role_instances: Vec<RoleInstance>
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 struct RoleInstance {
     #[serde(rename = "Configuration")]
     pub configuration: Configuration
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 struct Configuration {
     #[serde(rename = "Certificates", default)]
     pub certificates: String,
@@ -73,25 +73,25 @@ struct Configuration {
     pub shared_config: String,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 struct CertificatesFile {
     #[serde(rename = "Data", default)]
     pub data: String
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 struct Versions {
     #[serde(rename = "Supported")]
     pub supported: Supported
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 struct Supported {
     #[serde(rename = "Version", default)]
     pub versions: Vec<String>
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 struct SharedConfig {
     #[serde(rename = "Incarnation")]
     pub incarnation: Incarnation,
@@ -99,18 +99,18 @@ struct SharedConfig {
     pub instances: Instances,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 struct Incarnation {
     pub instance: String,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 struct Instances {
     #[serde(rename = "Instance", default)]
     pub instances: Vec<Instance>,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 struct Instance {
     pub id: String,
     pub address: String,
@@ -118,13 +118,13 @@ struct Instance {
     pub input_endpoints: InputEndpoints,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 struct InputEndpoints {
     #[serde(rename = "Endpoint", default)]
     pub endpoints: Vec<Endpoint>,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 struct Endpoint {
     #[serde(rename = "loadBalancedPublicAddress", default)]
     pub load_balanced_public_address: String,
@@ -136,9 +136,11 @@ struct Attributes {
     pub dynamic_ipv4: Option<IpAddr>,
 }
 
+#[derive(Debug, Clone)]
 struct Azure {
     client: retry::Client,
     endpoint: IpAddr,
+    goal_state: GoalState,
 }
 
 impl Azure {
@@ -148,15 +150,28 @@ impl Azure {
         let client = retry::Client::new()?
             .header(MSAgentName(MS_AGENT_NAME.to_owned()))
             .header(MSVersion(MS_VERSION.to_owned()));
-        let azure = Azure {
+
+        let mut azure = Azure {
             client: client,
             endpoint: addr,
+            goal_state: GoalState::default(),
         };
+
+        // make sure the metadata service is compatible with our version
         azure.is_fabric_compatible(MS_VERSION)
             .chain_err(|| "failed version compatibility check")?;
+
+        // populate goalstate
+        azure.goal_state = azure.get_goal_state()?;
         Ok(azure)
     }
 
+    fn get_goal_state(&self) -> Result<GoalState> {
+        self.client.get(retry::Xml, format!("http://{}/machine/?comp=goalstate", self.endpoint)).send()
+            .chain_err(|| "failed to get goal state")?
+        .ok_or_else(|| "failed to get goal state: not found response".into())
+    }
+
     fn get_fabric_address() -> Result<IpAddr> {
         let v = util::dns_lease_key_lookup(OPTION_245)?;
         // value is an 8 digit hex value. convert it to u32 and
@@ -180,17 +195,9 @@ impl Azure {
         }
     }
 
-    fn get_goal_state(&self) -> Result<GoalState> {
-        self.client.get(retry::Xml, format!("http://{}/machine/?comp=goalstate", self.endpoint)).send()
-            .chain_err(|| "failed to get goal state")?
-            .ok_or_else(|| "failed to get goal state: not found response".into())
-    }
-
     fn get_certs_endpoint(&self) -> Result<String> {
-        let goalstate = self.get_goal_state()?;
-
         // grab the certificates endpoint from the xml and return it
-        let cert_endpoint: &str = &goalstate.container.role_instance_list.role_instances[0].configuration.certificates;
+        let cert_endpoint: &str = &self.goal_state.container.role_instance_list.role_instances[0].configuration.certificates;
         Ok(String::from(cert_endpoint))
     }
 
@@ -243,9 +250,7 @@ impl Azure {
     }
 
     fn get_attributes(&self) -> Result<Attributes> {
-        let goalstate = self.get_goal_state()?;
-
-        let endpoint = &goalstate.container.role_instance_list.role_instances[0].configuration.shared_config;
+        let endpoint = &self.goal_state.container.role_instance_list.role_instances[0].configuration.shared_config;
 
         let shared_config: SharedConfig = self.client.get(retry::Xml, endpoint.to_string()).send()
             .chain_err(|| "failed to get shared configuration")?

From 630b604b5e70a3e3592362283a5b7733e1610d59 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Thu, 21 Sep 2017 18:08:55 -0700
Subject: [PATCH 57/71] providers/oracle: initial implementation

this uses the oracle metadata service to fetch metadata
---
 src/lib.rs                  |  1 +
 src/providers/mod.rs        |  1 +
 src/providers/oracle/mod.rs | 47 +++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 src/providers/oracle/mod.rs

diff --git a/src/lib.rs b/src/lib.rs
index d71e0d29..94e82a18 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -93,6 +93,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Metadata> {
         "ec2" => ec2::fetch_metadata(),
         "gce" => gce::fetch_metadata(),
         "openstack" => openstack::fetch_metadata(),
+        "oracle-oci" => oracle::fetch_metadata(),
         "packet" => packet::fetch_metadata(),
         "vagrant-virtualbox" => vagrant_virtualbox::fetch_metadata(),
         _ => Err(errors::ErrorKind::UnknownProvider(provider.to_owned()).into()),
diff --git a/src/providers/mod.rs b/src/providers/mod.rs
index 642a7d1f..49841d3d 100644
--- a/src/providers/mod.rs
+++ b/src/providers/mod.rs
@@ -28,5 +28,6 @@ pub mod digitalocean;
 pub mod ec2;
 pub mod gce;
 pub mod openstack;
+pub mod oracle;
 pub mod packet;
 pub mod vagrant_virtualbox;
diff --git a/src/providers/oracle/mod.rs b/src/providers/oracle/mod.rs
new file mode 100644
index 00000000..7770858a
--- /dev/null
+++ b/src/providers/oracle/mod.rs
@@ -0,0 +1,47 @@
+//! oracle metadata fetcher
+
+use retry;
+use metadata;
+use errors::*;
+
+use openssh_keys::PublicKey;
+
+#[derive(Debug, Deserialize, Clone)]
+struct InstanceData {
+    #[serde(rename = "availabilityDomain")]
+    availability_domain: String,
+    #[serde(rename = "compartmentId")]
+    compartment_id: String,
+    #[serde(rename = "displayName")]
+    display_name: String,
+    id: String,
+    image: String,
+    region: String,
+    shape: String,
+    #[serde(rename = "timeCreated")]
+    time_created: u64,
+    metadata: Metadata,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+struct Metadata {
+    ssh_authorized_keys: String,
+}
+
+pub fn fetch_metadata() -> Result<metadata::Metadata> {
+    let client = retry::Client::new()
+        .chain_err(|| "oracle: failed to create http client")?;
+
+    let data: InstanceData = client.get(retry::Json, "http://169.254.169.254/opc/v1/instance/".into()).send()
+        .chain_err(|| "oracle: failed to get instance metadata from metadata service")?
+        .ok_or_else(|| "oracle: failed to get instance metadata from metadata service: no response")?;
+
+    let ssh_keys = PublicKey::read_keys(data.metadata.ssh_authorized_keys.as_bytes())?;
+
+    Ok(metadata::Metadata::builder()
+        .add_attribute("ORACLE_OCI_DISPLAY_NAME".into(), data.display_name)
+        .add_attribute("ORACLE_OCI_INSTANCE_ID".into(), data.id)
+        .add_attribute("ORACLE_OCI_REGION".into(), data.region)
+        .add_publickeys(ssh_keys)
+        .build())
+}

From d50693e09f815748cd7f65146fa2e989056b891d Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 26 Sep 2017 21:18:55 -0700
Subject: [PATCH 58/71] retry: implement generic retrying function

This breaks out the retry logic into it's own separate function. This is
a cleaner and simpler organization strategy, and allows us to use the
retry logic on anything that returns a Result, instead of just the
client logic.
---
 src/retry/client.rs | 224 +++++++++++++++++++++++++++++++++++++++++
 src/retry/mod.rs    | 237 +++++++-------------------------------------
 2 files changed, 260 insertions(+), 201 deletions(-)
 create mode 100644 src/retry/client.rs

diff --git a/src/retry/client.rs b/src/retry/client.rs
new file mode 100644
index 00000000..ba8fa46f
--- /dev/null
+++ b/src/retry/client.rs
@@ -0,0 +1,224 @@
+// Copyright 2017 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! retry
+//!
+//! this is an abstraction over the regular http get request. it allows you to
+//! have a request retry until it succeeds, with a configurable number of
+//! of attempts and a backoff strategy. It also takes care of automatically
+//! deserializing responses and handles headers in a sane way.
+
+use std::io::Read;
+use std::time::Duration;
+
+use reqwest;
+use reqwest::header;
+use reqwest::header::ContentType;
+use reqwest::{Method,Request};
+
+use serde;
+use serde_xml_rs;
+use serde_json;
+
+use retry::Retry;
+use errors::*;
+
+use retry::raw_deserializer;
+
+pub trait Deserializer {
+    fn deserialize<T, R>(&self, R) -> Result<T>
+        where T: for<'de> serde::Deserialize<'de>, R: Read;
+    fn content_type(&self) -> ContentType;
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct Xml;
+
+impl Deserializer for Xml {
+    fn deserialize<T, R>(&self, r: R) -> Result<T>
+        where T: for<'de> serde::Deserialize<'de>, R: Read
+    {
+        serde_xml_rs::deserialize(r)
+            .chain_err(|| "failed xml deserialization")
+    }
+    fn content_type(&self) -> ContentType {
+        ContentType("text/xml; charset=utf-8".parse().unwrap())
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct Json;
+
+impl Deserializer for Json {
+    fn deserialize<T, R>(&self, r: R) -> Result<T>
+        where T: serde::de::DeserializeOwned, R: Read
+    {
+        serde_json::from_reader(r)
+            .chain_err(|| "failed json deserialization")
+    }
+    fn content_type(&self) -> ContentType {
+        ContentType("text/json; charset=utf-8".parse().unwrap())
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct Raw;
+
+impl Deserializer for Raw {
+    fn deserialize<T, R>(&self, r: R) -> Result<T>
+        where T: for<'de> serde::Deserialize<'de>, R: Read
+    {
+        raw_deserializer::from_reader(r)
+            .chain_err(|| "failed raw deserialization")
+    }
+    fn content_type(&self) -> ContentType {
+        ContentType("text/plain; charset=utf-8".parse().unwrap())
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct Client {
+    client: reqwest::Client,
+    headers: header::Headers,
+    retry: Retry,
+    return_on_404: bool,
+}
+
+impl Client {
+    pub fn new() -> Result<Self> {
+        let client = reqwest::Client::new()
+            .chain_err(|| "failed to initialize client")?;
+        Ok(Client{
+            client,
+            headers: header::Headers::new(),
+            retry: Retry::new(),
+            return_on_404: false,
+        })
+    }
+
+    pub fn header<H>(mut self, h: H) -> Self
+        where H: header::Header
+    {
+        self.headers.set(h);
+        self
+    }
+
+    pub fn initial_backoff(mut self, initial_backoff: Duration) -> Self {
+        self.retry = self.retry.initial_backoff(initial_backoff);
+        self
+    }
+
+    pub fn max_backoff(mut self, max_backoff: Duration) -> Self {
+        self.retry = self.retry.max_backoff(max_backoff);
+        self
+    }
+
+    /// max_attempts will panic if the argument is greater than 500
+    pub fn max_attempts(mut self, max_attempts: u32) -> Self {
+        self.retry = self.retry.max_attempts(max_attempts);
+        self
+    }
+
+    pub fn return_on_404(mut self, return_on_404: bool) -> Self {
+        self.return_on_404 = return_on_404;
+        self
+    }
+
+    pub fn get<D>(&self, d: D, url: String) -> RequestBuilder<D>
+        where D: Deserializer
+    {
+        RequestBuilder{
+            url,
+            d,
+            client: self.client.clone(),
+            headers: self.headers.clone(),
+            retry: self.retry.clone(),
+            return_on_404: self.return_on_404,
+        }
+    }
+}
+
+pub struct RequestBuilder<D>
+    where D: Deserializer
+{
+    url: String,
+    d: D,
+    client: reqwest::Client,
+    headers: header::Headers,
+    retry: Retry,
+    return_on_404: bool,
+}
+
+impl<D> RequestBuilder<D>
+    where D: Deserializer
+{
+
+    pub fn header<H>(mut self, h: H) -> Self
+        where H: header::Header
+    {
+        self.headers.set(h);
+        self
+    }
+
+    pub fn send<T>(self) -> Result<Option<T>>
+        where T: for<'de> serde::Deserialize<'de>
+    {
+        let url = reqwest::Url::parse(self.url.as_str())
+            .chain_err(|| "failed to parse uri")?;
+        let mut req = Request::new(Method::Get, url);
+        req.headers_mut().extend(self.headers.iter());
+        req.headers_mut().set(self.d.content_type());
+
+        self.retry.clone().retry(|attempt| {
+            info!("Fetching {}: Attempt #{}", req.url(), attempt + 1);
+            self.dispatch_request(&req)
+        })
+    }
+
+    fn dispatch_request<T>(&self, req: &Request) -> Result<Option<T>>
+        where T: for<'de> serde::Deserialize<'de>
+    {
+        match self.client.execute(clone_request(req)) {
+            Ok(resp) => {
+                match (resp.status(), self.return_on_404) {
+                    (reqwest::StatusCode::Ok,_) => {
+                        info!("Fetch successful");
+                        self.d.deserialize(resp)
+                            .map(Some)
+                            .chain_err(|| "failed to deserialize data")
+                    }
+                    (reqwest::StatusCode::NotFound,true) => {
+                        info!("Fetch failed with 404: resource not found");
+                        Ok(None)
+                    }
+                    (s,_) => {
+                        info!("Failed to fetch: {}", s);
+                        Err(format!("failed to fetch: {}", s).into())
+                    }
+                }
+            }
+            Err(e) => {
+                info!("Failed to fetch: {}", e);
+                Err(Error::with_chain(e, "failed to fetch"))
+            }
+        }
+    }
+}
+
+/// Reqwests Request struct doesn't implement copy, so we have to do it here
+fn clone_request(req: &Request) -> Request {
+    let mut newreq = Request::new(req.method().clone(), req.url().clone());
+    newreq.headers_mut().extend(req.headers().iter());
+    newreq
+}
diff --git a/src/retry/mod.rs b/src/retry/mod.rs
index ea4f6edd..17a7c69a 100644
--- a/src/retry/mod.rs
+++ b/src/retry/mod.rs
@@ -12,114 +12,36 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! retry
-//!
-//! this is an abstraction over the regular http get request. it allows you to
-//! have a request retry until it succeeds, with a configurable number of
-//! of attempts and a backoff strategy. It also takes care of automatically
-//! deserializing responses and handles headers in a sane way.
+//! retry is a generic function that retrys functions until they succeed.
 
-use std::io::Read;
+use errors::*;
 use std::time::Duration;
 use std::thread;
 
-use reqwest;
-use reqwest::header;
-use reqwest::header::ContentType;
-use reqwest::{Method,Request};
-
-use serde;
-use serde_xml_rs;
-use serde_json;
-
-mod raw_deserializer;
-
-use errors::*;
-
-pub fn default_initial_backoff() -> Duration { Duration::new(1,0) }
-pub fn default_max_backoff() -> Duration { Duration::new(5,0) }
-pub fn default_max_attempts() -> u32 { 10 }
-
-pub trait Deserializer {
-    fn deserialize<T, R>(&self, R) -> Result<T>
-        where T: for<'de> serde::Deserialize<'de>, R: Read;
-    fn content_type(&self) -> ContentType;
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct Xml;
-
-impl Deserializer for Xml {
-    fn deserialize<T, R>(&self, r: R) -> Result<T>
-        where T: for<'de> serde::Deserialize<'de>, R: Read
-    {
-        serde_xml_rs::deserialize(r)
-            .chain_err(|| "failed xml deserialization")
-    }
-    fn content_type(&self) -> ContentType {
-        ContentType("text/xml; charset=utf-8".parse().unwrap())
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct Json;
+pub mod raw_deserializer;
+mod client;
+pub use self::client::*;
 
-impl Deserializer for Json {
-    fn deserialize<T, R>(&self, r: R) -> Result<T>
-        where T: serde::de::DeserializeOwned, R: Read
-    {
-        serde_json::from_reader(r)
-            .chain_err(|| "failed json deserialization")
-    }
-    fn content_type(&self) -> ContentType {
-        ContentType("text/json; charset=utf-8".parse().unwrap())
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct Raw;
-
-impl Deserializer for Raw {
-    fn deserialize<T, R>(&self, r: R) -> Result<T>
-        where T: for<'de> serde::Deserialize<'de>, R: Read
-    {
-        raw_deserializer::from_reader(r)
-            .chain_err(|| "failed raw deserialization")
-    }
-    fn content_type(&self) -> ContentType {
-        ContentType("text/plain; charset=utf-8".parse().unwrap())
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Client {
-    client: reqwest::Client,
-    headers: header::Headers,
+#[derive(Clone, Debug)]
+pub struct Retry {
     initial_backoff: Duration,
     max_backoff: Duration,
     max_attempts: u32,
-    return_on_404: bool,
 }
 
-impl Client {
-    pub fn new() -> Result<Self> {
-        let client = reqwest::Client::new()
-            .chain_err(|| "failed to initialize client")?;
-        Ok(Client{
-            client,
-            headers: header::Headers::new(),
-            initial_backoff: default_initial_backoff(),
-            max_backoff:  default_max_backoff(),
-            max_attempts: default_max_attempts(),
-            return_on_404: false,
-        })
+impl ::std::default::Default for Retry {
+    fn default() -> Self {
+        Retry {
+            initial_backoff: Duration::new(1,0),
+            max_backoff: Duration::new(5,0),
+            max_attempts: 10,
+        }
     }
+}
 
-    pub fn header<H>(mut self, h: H) -> Self
-        where H: header::Header
-    {
-        self.headers.set(h);
-        self
+impl Retry {
+    pub fn new() -> Self {
+        Retry::default()
     }
 
     pub fn initial_backoff(mut self, initial_backoff: Duration) -> Self {
@@ -132,125 +54,38 @@ impl Client {
         self
     }
 
-    /// max_attempts will panic if the argument is greater than 500
     pub fn max_attempts(mut self, max_attempts: u32) -> Self {
-        if max_attempts > 500 {
-            // Picking 500 as a max_attempts number arbitrarily, to prevent the mutually recursive
-            // functions dispatch_request and wait_then_retry from blowing up the stack
-            panic!("max_attempts cannot be greater than 500")
-        } else {
-            self.max_attempts = max_attempts;
-            self
-        }
-    }
-
-    pub fn return_on_404(mut self, return_on_404: bool) -> Self {
-        self.return_on_404 = return_on_404;
-        self
-    }
-
-    pub fn get<D>(&self, d: D, url: String) -> RequestBuilder<D>
-        where D: Deserializer
-    {
-        RequestBuilder{
-            url,
-            d,
-            client: self.client.clone(),
-            headers: self.headers.clone(),
-            initial_backoff: self.initial_backoff,
-            max_backoff: self.max_backoff,
-            max_attempts: self.max_attempts,
-            return_on_404: self.return_on_404,
-        }
-    }
-}
-
-pub struct RequestBuilder<D>
-    where D: Deserializer
-{
-    url: String,
-    d: D,
-    client: reqwest::Client,
-    headers: header::Headers,
-    initial_backoff: Duration,
-    max_backoff: Duration,
-    max_attempts: u32,
-    return_on_404: bool,
-}
-
-impl<D> RequestBuilder<D>
-    where D: Deserializer
-{
-
-    pub fn header<H>(mut self, h: H) -> Self
-        where H: header::Header
-    {
-        self.headers.set(h);
+        self.max_attempts = max_attempts;
         self
     }
 
-    pub fn send<T>(&self) -> Result<Option<T>>
-        where T: for<'de> serde::Deserialize<'de>
+    pub fn retry<F, R>(self, try: F) -> Result<R>
+        where F: Fn(u32) -> Result<R>
     {
-        let url = reqwest::Url::parse(self.url.as_str())
-            .chain_err(|| "failed to parse uri")?;
-        let mut req = Request::new(Method::Get, url);
-        req.headers_mut().extend(self.headers.iter());
-        req.headers_mut().set(self.d.content_type());
-        self.dispatch_request(req, self.initial_backoff, 0)
-    }
+        let mut delay = self.initial_backoff;
+        let mut attempts = 0;
 
-    fn dispatch_request<T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<Option<T>>
-        where T: for<'de> serde::Deserialize<'de>
-    {
-        info!("Fetching {}: Attempt#{}", req.url(), num_attempts + 1);
+        loop {
+            let res = try(attempts);
 
-        match self.client.execute(clone_request(&req)) {
-            Ok(resp) => {
-                match (resp.status(), self.return_on_404) {
-                    (reqwest::StatusCode::Ok,_) => {
-                        info!("Fetch successful");
-                        self.d.deserialize(resp)
-                            .map(Some)
-                            .chain_err(|| "failed to deserialize data")
-                    }
-                    (reqwest::StatusCode::NotFound,true) => {
-                        info!("Fetch failed with 404: resource not found");
-                        Ok(None)
-                    }
-                    (s,_) => {
-                        info!("Failed to fetch: {}", s);
-                        self.wait_then_retry(req, delay, num_attempts)
-                    }
-                }
+            // if the result is ok, we don't need to try again
+            if res.is_ok() {
+                break res;
             }
-            Err(e) => {
-                info!("Failed to fetch: {}", e);
-                self.wait_then_retry(req, delay, num_attempts)
+
+            // otherwise, perform the retry-backoff logic
+            attempts += 1;
+            if attempts == self.max_attempts {
+                break res.map_err(|e| Error::with_chain(e, "timed out"));
             }
-        }
-    }
 
-    fn wait_then_retry<T>(&self, req: Request, delay: Duration, num_attempts: u32) -> Result<Option<T>>
-        where T: for<'de> serde::Deserialize<'de>
-    {
-        thread::sleep(delay);
-        let delay = if self.max_backoff != Duration::new(0,0) && delay * 2 > self.max_backoff {
+            thread::sleep(delay);
+
+            delay = if self.max_backoff != Duration::new(0,0) && delay * 2 > self.max_backoff {
                 self.max_backoff
             } else {
                 delay * 2
             };
-        let num_attempts = num_attempts + 1;
-        if num_attempts == self.max_attempts {
-            Err(format!("Timed out while fetching {}", req.url()).into())
-        } else {
-            self.dispatch_request(req, delay, num_attempts)
         }
     }
 }
-
-fn clone_request(req: &Request) -> Request {
-    let mut newreq = Request::new(req.method().clone(), req.url().clone());
-    newreq.headers_mut().extend(req.headers().iter());
-    newreq
-}

From 5e2ec42661d77cc3fbedc5f9420253b8d328e130 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 26 Sep 2017 21:26:05 -0700
Subject: [PATCH 59/71] util: use retry to find dhcp lease

before this commit, finding the dhcp lease would just loop forever until
it found one. now we have backoff logic so we don't hang forever if the
lease doesn't show up, and instead print an error message.
---
 src/util/mod.rs | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/util/mod.rs b/src/util/mod.rs
index 6fe0e901..0655130a 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -19,8 +19,8 @@ use std::io::{Read, BufRead, BufReader};
 use std::fs::File;
 use std::path::Path;
 use std::time::Duration;
-use std::thread;
 use errors::*;
+use retry;
 
 fn key_lookup_line(delim: char, key: &str, line: &str) -> Option<String> {
     match line.find(delim) {
@@ -61,31 +61,29 @@ pub fn dns_lease_key_lookup(key: &str) -> Result<String> {
     let interfaces = pnet::datalink::interfaces();
     trace!("interfaces - {:?}", interfaces);
 
-    // if we don't find the dhcp lease, keep trying
-    // TODO(sdemos): eventually this should be a backoff timer instead of
-    // looping forever.
-    loop {
-        for interface in interfaces.clone() {
-            trace!("looking at interface {:?}", interface);
-            let lease_path = format!("/run/systemd/netif/leases/{}", interface.index);
-            let lease_path = Path::new(&lease_path);
-            if lease_path.exists() {
-                debug!("found lease file - {:?}", lease_path);
-                let lease = File::open(&lease_path)
-                    .chain_err(|| format!("failed to open lease file ({:?})", lease_path))?;
+    retry::Retry::new()
+        .initial_backoff(Duration::from_millis(50))
+        .max_backoff(Duration::from_millis(500))
+        .max_attempts(60)
+        .retry(|_| {
+            for interface in interfaces.clone() {
+                trace!("looking at interface {:?}", interface);
+                let lease_path = format!("/run/systemd/netif/leases/{}", interface.index);
+                let lease_path = Path::new(&lease_path);
+                if lease_path.exists() {
+                    debug!("found lease file - {:?}", lease_path);
+                    let lease = File::open(&lease_path)
+                        .chain_err(|| format!("failed to open lease file ({:?})", lease_path))?;
 
-                if let Some(v) = key_lookup_reader('=', key, lease)? {
-                    return Ok(v);
-                }
+                    if let Some(v) = key_lookup_reader('=', key, lease)? {
+                        return Ok(v);
+                    }
 
-                debug!("failed to get value from existing lease file '{:?}'", lease_path);
+                    debug!("failed to get value from existing lease file '{:?}'", lease_path);
+                }
             }
-        }
-
-        // sleep for a bit
-        thread::sleep(Duration::from_millis(500));
-    }
-    // Err("failed to retrieve fabric address".into())
+            Err("failed to retrieve fabric address".into())
+        })
 }
 
 #[cfg(test)]

From 32f3c807307f9157f45a4093359179fad6cf60ef Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Mon, 25 Sep 2017 16:40:19 -0700
Subject: [PATCH 60/71] providers/cloudstack: implement network metadata

this gets metadata from the cloudstack network metadata service.
---
 src/lib.rs                          |  1 +
 src/providers/cloudstack/mod.rs     |  3 ++
 src/providers/cloudstack/network.rs | 50 +++++++++++++++++++++++++++++
 src/providers/mod.rs                |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 src/providers/cloudstack/mod.rs
 create mode 100644 src/providers/cloudstack/network.rs

diff --git a/src/lib.rs b/src/lib.rs
index 94e82a18..3d4f2562 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -89,6 +89,7 @@ use errors::*;
 pub fn fetch_metadata(provider: &str) -> Result<Metadata> {
     match provider {
         "azure" => azure::fetch_metadata(),
+        "cloudstack-metadata" => cloudstack::network::fetch_metadata(),
         "digitalocean" => digitalocean::fetch_metadata(),
         "ec2" => ec2::fetch_metadata(),
         "gce" => gce::fetch_metadata(),
diff --git a/src/providers/cloudstack/mod.rs b/src/providers/cloudstack/mod.rs
new file mode 100644
index 00000000..fc574ab7
--- /dev/null
+++ b/src/providers/cloudstack/mod.rs
@@ -0,0 +1,3 @@
+//! Metadata fetchers for the cloudstack provider
+
+pub mod network;
diff --git a/src/providers/cloudstack/network.rs b/src/providers/cloudstack/network.rs
new file mode 100644
index 00000000..905b5e8c
--- /dev/null
+++ b/src/providers/cloudstack/network.rs
@@ -0,0 +1,50 @@
+//! network metadata fetcher for the cloudstack provider
+
+use errors::*;
+use metadata::Metadata;
+use std::net::IpAddr;
+use std::time::Duration;
+use retry;
+use openssh_keys::PublicKey;
+use util;
+
+const SERVER_ADDRESS: &'static str = "SERVER_ADDRESS";
+
+pub fn fetch_metadata() -> Result<Metadata> {
+    // first, find the address of the metadata service
+    let server = get_dhcp_server_address()?;
+    let client = retry::Client::new()?
+        .initial_backoff(Duration::from_secs(1))
+        .max_backoff(Duration::from_secs(5))
+        .max_attempts(10);
+    let endpoint_for = |key| format!("http://{}/latest/meta-data/{}", server, key);
+
+    // then get the ssh keys and parse them
+    let keys: Option<String> = client.get(retry::Raw, endpoint_for("public-keys")).send()
+        .chain_err(|| "failed to get public keys")?;
+
+    let mut builder = Metadata::builder();
+    if let Some(k) = keys {
+        let keys = PublicKey::read_keys(k.as_bytes())?;
+        builder = builder.add_publickeys(keys);
+    }
+
+    Ok(builder
+       .add_attribute_if_exists("CLOUDSTACK_INSTANCE_ID".into(), client.get(retry::Raw, endpoint_for("instance-id")).send()?)
+       .add_attribute_if_exists("CLOUDSTACK_LOCAL_HOSTNAME".into(), client.get(retry::Raw, endpoint_for("local-hostname")).send()?)
+       .add_attribute_if_exists("CLOUDSTACK_PUBLIC_HOSTNAME".into(), client.get(retry::Raw, endpoint_for("public-hostname")).send()?)
+       .add_attribute_if_exists("CLOUDSTACK_AVAILABILITY_ZONE".into(), client.get(retry::Raw, endpoint_for("availability-zone")).send()?)
+       .add_attribute_if_exists("CLOUDSTACK_IPV4_PUBLIC".into(), client.get(retry::Raw, endpoint_for("public-ipv4")).send()?)
+       .add_attribute_if_exists("CLOUDSTACK_IPV4_LOCAL".into(), client.get(retry::Raw, endpoint_for("local-ipv4")).send()?)
+       .add_attribute_if_exists("CLOUDSTACK_SERVICE_OFFERING".into(), client.get(retry::Raw, endpoint_for("service-offering")).send()?)
+       .add_attribute_if_exists("CLOUDSTACK_CLOUD_IDENTIFIER".into(), client.get(retry::Raw, endpoint_for("cloud-identifier")).send()?)
+       .add_attribute_if_exists("CLOUDSTACK_VM_ID".into(), client.get(retry::Raw, endpoint_for("vm-id")).send()?)
+       .build())
+}
+
+fn get_dhcp_server_address() -> Result<IpAddr> {
+    let server = util::dns_lease_key_lookup(SERVER_ADDRESS)?;
+    let ip = server.parse()
+        .chain_err(|| format!("failed to parse server ip address: {}", server))?;
+    Ok(IpAddr::V4(ip))
+}
diff --git a/src/providers/mod.rs b/src/providers/mod.rs
index 49841d3d..fcc0bad6 100644
--- a/src/providers/mod.rs
+++ b/src/providers/mod.rs
@@ -25,6 +25,7 @@
 
 pub mod azure;
 pub mod digitalocean;
+pub mod cloudstack;
 pub mod ec2;
 pub mod gce;
 pub mod openstack;

From 569e6a6f4fe1ac30d824102e6a122980f29f4912 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Wed, 27 Sep 2017 14:57:45 -0700
Subject: [PATCH 61/71] cargo: add nix and tempdir dependencies

we need nix and tempdir to mount the configdrive used by the cloudstack
provider.
---
 Cargo.lock | 14 ++++++++++++++
 Cargo.toml |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index d8dac24a..58f694fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12,6 +12,7 @@ dependencies = [
  "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "mockito 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssh-keys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -24,6 +25,7 @@ dependencies = [
  "slog-async 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-term 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "update-ssh-keys 0.1.0 (git+https://github.com/sdemos/update-ssh-keys-rs)",
  "users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -583,6 +585,17 @@ dependencies = [
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "nix"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.9"
@@ -1389,6 +1402,7 @@ dependencies = [
 "checksum mockito 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c1b79c374f7fb89af61c1d49086c824a1c2abe9cfcfe6b182980959b70fb4b4a"
 "checksum native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04b781c9134a954c84f0594b9ab3f5606abc516030388e8511887ef4c204a1e5"
 "checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
+"checksum nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32"
 "checksum nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "52cd74cd09beba596430cc6e3091b74007169a56246e1262f0ba451ea95117b2"
 "checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525"
 "checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba"
diff --git a/Cargo.toml b/Cargo.toml
index d2f4a924..fa316e85 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,6 +30,8 @@ update-ssh-keys = { git = "https://github.com/sdemos/update-ssh-keys-rs" }
 ipnetwork = "0.12"
 clippy = { version = "*", optional = true }
 hostname = "0.1"
+tempdir = "0.3"
+nix = "0.9"
 
 [dependencies.slog]
 version = "*"

From 4e83bf5521b78e59374117b5d3e1e3efce10e617 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Wed, 27 Sep 2017 14:58:44 -0700
Subject: [PATCH 62/71] providers/cloudstack: implement configdrive

this module gets metadata from the cloudstack configdrive
---
 src/lib.rs                              |   3 +
 src/providers/cloudstack/configdrive.rs | 104 ++++++++++++++++++++++++
 src/providers/cloudstack/mod.rs         |   1 +
 3 files changed, 108 insertions(+)
 create mode 100644 src/providers/cloudstack/configdrive.rs

diff --git a/src/lib.rs b/src/lib.rs
index 3d4f2562..e9ca024c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -45,6 +45,8 @@ extern crate update_ssh_keys;
 
 extern crate users;
 extern crate hostname;
+extern crate tempdir;
+extern crate nix;
 
 extern crate ipnetwork;
 
@@ -90,6 +92,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Metadata> {
     match provider {
         "azure" => azure::fetch_metadata(),
         "cloudstack-metadata" => cloudstack::network::fetch_metadata(),
+        "cloudstack-configdrive" => cloudstack::configdrive::fetch_metadata(),
         "digitalocean" => digitalocean::fetch_metadata(),
         "ec2" => ec2::fetch_metadata(),
         "gce" => gce::fetch_metadata(),
diff --git a/src/providers/cloudstack/configdrive.rs b/src/providers/cloudstack/configdrive.rs
new file mode 100644
index 00000000..31988285
--- /dev/null
+++ b/src/providers/cloudstack/configdrive.rs
@@ -0,0 +1,104 @@
+//! configdrive metadata fetcher for cloudstack
+
+use errors::*;
+use metadata::Metadata;
+use nix::mount;
+use openssh_keys::PublicKey;
+use std::path::{Path, PathBuf};
+use std::fs::File;
+use std::io::Read;
+use tempdir::TempDir;
+
+const CONFIG_DRIVE_LABEL_1: &'static str = "config-2";
+const CONFIG_DRIVE_LABEL_2: &'static str = "CONFIG-2";
+
+#[derive(Debug)]
+struct ConfigDrive {
+    temp_dir: Option<TempDir>,
+    target: PathBuf,
+    path: PathBuf,
+}
+
+impl ConfigDrive {
+    fn new() -> Result<Self> {
+        // maybe its already mounted
+        let path = Path::new("/media/ConfigDrive/cloudstack/metadata/");
+        if path.exists() {
+            return Ok(ConfigDrive {
+                temp_dir: None,
+                path: path.to_owned(),
+                target: path.to_owned(),
+            })
+        }
+
+        // if not try and mount with each of the labels
+        let target = TempDir::new("coreos-metadata")
+            .chain_err(|| "failed to create temporary directory")?;
+        mount_ro(&Path::new("/dev/disk/by-label/").join(CONFIG_DRIVE_LABEL_1), target.path(), "iso9660")
+            .or_else(|_| mount_ro(&Path::new("/dev/disk/by-label/").join(CONFIG_DRIVE_LABEL_2), target.path(), "iso9660"))?;
+
+        Ok(ConfigDrive {
+            path: target.path().join("cloudstack").join("metadata"),
+            target: target.path().to_owned(),
+            temp_dir: Some(target),
+        })
+    }
+
+    fn fetch_value(&self, key: &str) -> Result<Option<String>> {
+        let filename = self.path.join(format!("{}.txt", key));
+
+        if !filename.exists() {
+            return Ok(None)
+        }
+
+        let mut file = File::open(&filename)
+            .chain_err(|| format!("failed to open file '{:?}'", filename))?;
+
+        let mut contents = String::new();
+        file.read_to_string(&mut contents)
+            .chain_err(|| format!("failed to read from file '{:?}'", filename))?;
+
+        Ok(Some(contents))
+    }
+
+    fn fetch_publickeys(&self) -> Result<Vec<PublicKey>> {
+        let filename = self.path.join("public_keys.txt");
+        let file = File::open(&filename)
+            .chain_err(|| format!("failed to open file '{:?}'", filename))?;
+
+        PublicKey::read_keys(file)
+            .chain_err(|| "failed to read public keys from config drive file")
+    }
+}
+
+impl ::std::ops::Drop for ConfigDrive {
+    fn drop(&mut self) {
+        if self.temp_dir.is_some() {
+            unmount(&self.path).unwrap();
+        }
+    }
+}
+
+fn mount_ro(source: &Path, target: &Path, fstype: &str) -> Result<()> {
+    mount::mount(Some(source), target, Some(fstype), mount::MS_RDONLY, None::<&str>)
+        .chain_err(|| format!("failed to read-only mount source '{:?}' to target '{:?}' with filetype '{}'", source, target, fstype))
+}
+
+fn unmount(target: &Path) -> Result<()> {
+    mount::umount(target)
+        .chain_err(|| format!("failed to unmount target '{:?}'", target))
+}
+
+pub fn fetch_metadata() -> Result<Metadata> {
+    let drive = ConfigDrive::new()?;
+
+    Ok(Metadata::builder()
+       .add_publickeys(drive.fetch_publickeys()?)
+       .add_attribute_if_exists("CLOUDSTACK_AVAILABILITY_ZONE".into(), drive.fetch_value("availability_zone")?)
+       .add_attribute_if_exists("CLOUDSTACK_INSTANCE_ID".into(), drive.fetch_value("instance_id")?)
+       .add_attribute_if_exists("CLOUDSTACK_SERVICE_OFFERING".into(), drive.fetch_value("service_offering")?)
+       .add_attribute_if_exists("CLOUDSTACK_CLOUD_IDENTIFIER".into(), drive.fetch_value("cloud_identifier")?)
+       .add_attribute_if_exists("CLOUDSTACK_LOCAL_HOSTNAME".into(), drive.fetch_value("local_hostname")?)
+       .add_attribute_if_exists("CLOUDSTACK_VM_ID".into(), drive.fetch_value("vm_id")?)
+       .build())
+}
diff --git a/src/providers/cloudstack/mod.rs b/src/providers/cloudstack/mod.rs
index fc574ab7..4627493f 100644
--- a/src/providers/cloudstack/mod.rs
+++ b/src/providers/cloudstack/mod.rs
@@ -1,3 +1,4 @@
 //! Metadata fetchers for the cloudstack provider
 
 pub mod network;
+pub mod configdrive;

From 2ee7e10fb2b50cce52220e13be10db865bc0a308 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 30 Aug 2017 16:50:20 -0700
Subject: [PATCH 63/71] providers/openstack: initial implementation

this implements getting metadata from the openstack metadata service
---
 src/lib.rs                         |  2 +-
 src/providers/openstack/mod.rs     |  8 +-----
 src/providers/openstack/network.rs | 44 ++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 src/providers/openstack/network.rs

diff --git a/src/lib.rs b/src/lib.rs
index e9ca024c..f9b4546d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -96,7 +96,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Metadata> {
         "digitalocean" => digitalocean::fetch_metadata(),
         "ec2" => ec2::fetch_metadata(),
         "gce" => gce::fetch_metadata(),
-        "openstack" => openstack::fetch_metadata(),
+        "openstack-metadata" => openstack::network::fetch_metadata(),
         "oracle-oci" => oracle::fetch_metadata(),
         "packet" => packet::fetch_metadata(),
         "vagrant-virtualbox" => vagrant_virtualbox::fetch_metadata(),
diff --git a/src/providers/openstack/mod.rs b/src/providers/openstack/mod.rs
index a592b8f7..3af9e984 100644
--- a/src/providers/openstack/mod.rs
+++ b/src/providers/openstack/mod.rs
@@ -14,10 +14,4 @@
 
 //! openstack metadata fetcher
 
-use metadata::Metadata;
-
-use errors::*;
-
-pub fn fetch_metadata() -> Result<Metadata> {
-    unimplemented!();
-}
+pub mod network;
diff --git a/src/providers/openstack/network.rs b/src/providers/openstack/network.rs
new file mode 100644
index 00000000..25ff6b1e
--- /dev/null
+++ b/src/providers/openstack/network.rs
@@ -0,0 +1,44 @@
+//! openstack metadata fetcher
+
+use errors::*;
+use metadata::Metadata;
+use retry;
+
+const URL: &'static str = "http://169.254.169.254/latest/meta-data";
+
+fn url_for_key(key: &str) -> String {
+    format!("{}/{}", URL, key)
+}
+
+pub fn fetch_metadata() -> Result<Metadata> {
+    let client = retry::Client::new()
+        .chain_err(|| "openstack: failed to create http client")?;
+
+    let hostname: Option<String> = client.get(retry::Raw, url_for_key("hostname")).send()?;
+
+    Ok(Metadata::builder()
+        .add_attribute_if_exists("OPENSTACK_INSTANCE_ID".to_owned(), client.get(retry::Raw, url_for_key("instance-id")).send()?)
+        .add_attribute_if_exists("OPENSTACK_IPV4_LOCAL".to_owned(), client.get(retry::Raw, url_for_key("local-ipv4")).send()?)
+        .add_attribute_if_exists("OPENSTACK_IPV4_PUBLIC".to_owned(), client.get(retry::Raw, url_for_key("public-ipv4")).send()?)
+        .add_attribute_if_exists("OPENSTACK_HOSTNAME".to_owned(), hostname.clone())
+        .set_hostname_if_exists(hostname)
+        .add_ssh_keys(fetch_keys(&client)?)?
+        .build())
+}
+
+fn fetch_keys(client: &retry::Client) -> Result<Vec<String>> {
+    let keys_list: Option<String> = client.get(retry::Raw, url_for_key("public-keys")).send()?;
+    let mut keys = Vec::new();
+    if let Some(keys_list) = keys_list {
+        for l in keys_list.lines() {
+            let tokens: Vec<&str> = l.split('=').collect();
+            if tokens.len() != 2 {
+                return Err("error parsing keyID".into());
+            }
+            let key: String = client.get(retry::Raw, url_for_key(&format!("public-keys/{}/openssh-key", tokens[0]))).send()?
+                .ok_or("missing ssh key")?;
+            keys.push(key);
+        }
+    }
+    Ok(keys)
+}

From 5a44788343b2f889bcfb570dd185b29c75d51dfe Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Fri, 29 Sep 2017 15:33:44 -0700
Subject: [PATCH 64/71] readme: added readme with provider metadata

basically copied from the existing repo. additionally, it has ssh keys
for azure and network configs for packet on the list.

fixes #14
---
 README.md | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..6da94498
--- /dev/null
+++ b/README.md
@@ -0,0 +1,82 @@
+# CoreOS Metadata
+
+This is a small utility, typically used in conjunction with [Ignition][ignition], which reads metadata from a given cloud-provider and applies it to the system. This can include adding SSH keys and writing cloud-specific attributes into an environment file. This file can then be consumed by systemd service units via `EnvironmentFile=`.
+
+## Support
+
+The supported cloud providers and their respective metadata are as follows:
+
+  - azure
+    - SSH Keys
+    - Attributes
+      - COREOS_AZURE_IPV4_DYNAMIC
+      - COREOS_AZURE_IPV4_VIRTUAL
+  - digitalocean
+    - SSH Keys
+    - Network Configs
+    - Attributes
+      - COREOS_DIGITALOCEAN_HOSTNAME
+      - COREOS_DIGITALOCEAN_IPV4_ANCHOR_0
+      - COREOS_DIGITALOCEAN_IPV4_PUBLIC_0
+      - COREOS_DIGITALOCEAN_IPV4_PRIVATE_0
+      - COREOS_DIGITALOCEAN_IPV6_PUBLIC_0
+      - COREOS_DIGITALOCEAN_IPV6_PRIVATE_0
+      - COREOS_DIGITALOCEAN_REGION
+  - ec2
+    - SSH Keys
+    - Attributes
+      - COREOS_EC2_HOSTNAME
+      - COREOS_EC2_IPV4_LOCAL
+      - COREOS_EC2_IPV4_PUBLIC
+      - COREOS_EC2_AVAILABILITY_ZONE
+      - COREOS_EC2_INSTANCE_ID
+      - COREOS_EC2_REGION
+  - gce
+    - SSH Keys
+    - Attributes
+      - COREOS_GCE_HOSTNAME
+      - COREOS_GCE_IP_EXTERNAL_0
+      - COREOS_GCE_IP_LOCAL_0
+  - packet
+    - SSH Keys
+    - Network Configs
+    - Attributes
+      - COREOS_PACKET_HOSTNAME
+      - COREOS_PACKET_IPV4_PUBLIC_0
+      - COREOS_PACKET_IPV4_PRIVATE_0
+      - COREOS_PACKET_IPV6_PUBLIC_0
+  - openstack-metadata
+    - SSH Keys
+    - Attributes
+      - COREOS_OPENSTACK_HOSTNAME
+      - COREOS_OPENSTACK_IPV4_LOCAL
+      - COREOS_OPENSTACK_IPV4_PUBLIC
+      - COREOS_OPENSTACK_INSTANCE_ID
+  - cloudstack-configdrive
+    - SSH Keys
+    - Attributes
+      - COREOS_CLOUDSTACK_AVAILABILITY_ZONE
+      - COREOS_CLOUDSTACK_INSTANCE_ID
+      - COREOS_CLOUDSTACK_SERVICE_OFFERING
+      - COREOS_CLOUDSTACK_CLOUD_IDENTIFIER
+      - COREOS_CLOUDSTACK_LOCAL_HOSTNAME
+      - COREOS_CLOUDSTACK_VM_ID
+  - cloudstack-metadata
+    - SSH Keys
+    - Attributes
+      - COREOS_CLOUDSTACK_AVAILABILITY_ZONE
+      - COREOS_CLOUDSTACK_CLOUD_IDENTIFIER
+      - COREOS_CLOUDSTACK_HOSTNAME
+      - COREOS_CLOUDSTACK_INSTANCE_ID
+      - COREOS_CLOUDSTACK_IPV4_LOCAL
+      - COREOS_CLOUDSTACK_IPV4_PUBLIC
+      - COREOS_CLOUDSTACK_LOCAL_HOSTNAME
+      - COREOS_CLOUDSTACK_PUBLIC_HOSTNAME
+      - COREOS_CLOUDSTACK_SERVICE_OFFERING
+      - COREOS_CLOUDSTACK_VM_ID
+  - vagrant-virtualbox
+    - Attributes
+      - COREOS_VAGRANT_VIRTUALBOX_PRIVATE_IPV4
+      - COREOS_VAGRANT_VIRTUALBOX_HOSTNAME
+
+[ignition]: https://github.com/coreos/ignition

From 0de88350d3544d54914aa2367cd6402276a6aca6 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Mon, 2 Oct 2017 16:49:35 -0400
Subject: [PATCH 65/71] travis: added travis configuration for rust

now we have continuous integration. this builds on stable, beta, and
nightly, allowing for failures on nightly.
---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..8c91a741
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: rust
+rust:
+  - stable
+  - beta
+  - nightly
+matrix:
+  allow_failures:
+    - rust: nightly

From b1e6b1a347faeb1ce35cfef14d3f44791afa383a Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Mon, 2 Oct 2017 17:20:27 -0400
Subject: [PATCH 66/71] contributing: add rustfmt code style guideline

also removes golang code style guidelines
---
 CONTRIBUTING.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 70d08e8d..f15d76a9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,11 +44,9 @@ This is a rough outline of what a contributor's workflow looks like:
 
 Thanks for your contributions!
 
-### Coding Style
+### Code Style
 
-CoreOS projects written in Go follow a set of style guidelines that we've documented
-[here](https://github.com/coreos/docs/tree/master/golang). Please follow them when
-working on your contributions.
+Code should be formatted according to the output of [rustfmt](https://github.com/rust-lang-nursery/rustfmt)
 
 ### Format of the Commit Message
 

From 4a26d4b8a4fc9f2369ca0f5ddecf67e936465aa9 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Mon, 2 Oct 2017 17:24:56 -0400
Subject: [PATCH 67/71] tailor: added tailor config

now we can apply our code style guidlines to commit messages
automatically.
---
 .github/tailor.yaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/tailor.yaml

diff --git a/.github/tailor.yaml b/.github/tailor.yaml
new file mode 100644
index 00000000..019ec260
--- /dev/null
+++ b/.github/tailor.yaml
@@ -0,0 +1,15 @@
+rules:
+  - name: commit title scope
+    description: all commit titles must have a lowercase scope
+    expression:  |-
+      .commits all((.title test "^[a-z1-9/*,:_-]+:") or (.title test "^Revert"))
+
+  - name: commit title length
+    description: all commit titles must be no more than 50 characters
+    expression:  |-
+      .commits all((.title length < 51) or (.title test "^Revert"))
+
+  - name: commit description
+    description: all commits must have a description with each line having no more than 72 characters
+    expression: |-
+      .commits all((.description lines all(. length < 73) and (.description lines length > 0)) or (.title test "^Revert"))

From c9a37e6523873c06f2c570d69d74481e603e868a Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Tue, 3 Oct 2017 17:41:39 -0400
Subject: [PATCH 68/71] cargo: update dependencies

make sure we are using the latest of all our dependent libraries
---
 Cargo.lock | 109 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 70 insertions(+), 39 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 58f694fd..8be0e2e5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,10 +5,10 @@ dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.162 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.165 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hostname 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "mockito 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -27,7 +27,7 @@ dependencies = [
  "slog-term 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "update-ssh-keys 0.1.0 (git+https://github.com/sdemos/update-ssh-keys-rs)",
- "users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "users 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -68,11 +68,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "atty"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -163,7 +164,7 @@ version = "2.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -174,20 +175,20 @@ dependencies = [
 
 [[package]]
 name = "clippy"
-version = "0.0.162"
+version = "0.0.165"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy_lints 0.0.162 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy_lints 0.0.165 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "clippy_lints"
-version = "0.0.162"
+version = "0.0.165"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "itertools 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "pulldown-cmark 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -258,7 +259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "either"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -297,7 +298,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -349,7 +350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "hyper"
-version = "0.11.2"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -361,6 +362,7 @@ dependencies = [
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "relay 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -375,7 +377,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -419,10 +421,10 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -455,7 +457,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "lazy_static"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -555,7 +557,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "http-muncher 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -567,7 +569,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "schannel 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "schannel 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -638,7 +640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "num_cpus"
-version = "1.6.2"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -667,7 +669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-sys 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -756,6 +758,14 @@ name = "redox_syscall"
 version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "redox_termios"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "regex"
 version = "0.2.2"
@@ -773,6 +783,14 @@ name = "regex-syntax"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "relay"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "reqwest"
 version = "0.7.3"
@@ -780,7 +798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -814,13 +832,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "schannel"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crypt32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "secur32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -972,7 +990,7 @@ version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1098,6 +1116,16 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "termion"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.8.0"
@@ -1112,7 +1140,7 @@ name = "thread_local"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1248,13 +1276,13 @@ dependencies = [
 [[package]]
 name = "update-ssh-keys"
 version = "0.1.0"
-source = "git+https://github.com/sdemos/update-ssh-keys-rs#7f78b1f83c043ca1ddf42772cb548767b8f561ea"
+source = "git+https://github.com/sdemos/update-ssh-keys-rs#3e42c7a12d37e48356cc313db7b779f88e0f2c98"
 dependencies = [
  "clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssh-keys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "users 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1269,7 +1297,7 @@ dependencies = [
 
 [[package]]
 name = "users"
-version = "0.5.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1338,7 +1366,7 @@ dependencies = [
 "checksum advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a"
 "checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
 "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
-"checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
+"checksum atty 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "21e50800ec991574876040fff8ee46b136a53e985286fbe6a3bdfe6421b78860"
 "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
 "checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
@@ -1352,8 +1380,8 @@ dependencies = [
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
 "checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
 "checksum clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3451e409013178663435d6f15fdb212f14ee4424a3d74f979d081d0a66b6f1f2"
-"checksum clippy 0.0.162 (registry+https://github.com/rust-lang/crates.io-index)" = "fcdb42cab913b8eb5d390ba612400ec581813fb59af29afd39333d7a550f332c"
-"checksum clippy_lints 0.0.162 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c0da7936c88883ac09bc3b29584c275551eff961b2d0d87a22b60205088e55"
+"checksum clippy 0.0.165 (registry+https://github.com/rust-lang/crates.io-index)" = "88f67cdb6697a5d357f8f70cffdf65f4dcb6ec8bb5069f2bc347589b3869cbe8"
+"checksum clippy_lints 0.0.165 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f37194e4a7cb36daeeb5727eac96e32c82965e4ae8b119817885377ddb6715"
 "checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
 "checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
 "checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
@@ -1362,7 +1390,7 @@ dependencies = [
 "checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
 "checksum digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e5b29bf156f3f4b3c4f610a25ff69370616ae6e0657d416de22645483e72af0a"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
-"checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a"
+"checksum either 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbee135e9245416869bf52bd6ccc9b59e2482651510784e089b874272f02a252"
 "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
 "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
@@ -1376,18 +1404,18 @@ dependencies = [
 "checksum hostname 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d865f01509e69c001c31b8c341607d93caef4ecf6836ffee39a1702430147943"
 "checksum http-muncher 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f0d8b98946459faf4fdfdf6d90e9aac08967b9b9ffe67005d2b1f99115da741"
 "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
-"checksum hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "641abc3e3fcf0de41165595f801376e01106bca1fd876dda937730e477ca004c"
+"checksum hyper 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1b45eac8b696d59491b079bd04fcb0f3488c0f6ed62dcb36bcfea8a543e9cdc3"
 "checksum hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c81fa95203e2a6087242c38691a0210f23e9f3f8f944350bd676522132e2985"
 "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
 "checksum iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29d062ee61fccdf25be172e70f34c9f6efc597e1fb8f6526e8437b2046ab26be"
 "checksum ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)" = "2134e210e2a024b5684f90e1556d5f71a1ce7f8b12e9ac9924c67fb36f63b336"
 "checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
-"checksum itertools 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ab4d6a273c31ef276c917019239588b23bc696f277af8db10742cba3c27ec2f0"
+"checksum itertools 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d3f2be4da1690a039e9ae5fd575f706a63ad5a2120f161b1d653c9da3930dd21"
 "checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
 "checksum kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e014dab1082fd9d80ea1fa6fcb261b47ed3eb511612a14198bb507701add083e"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
-"checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
+"checksum lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c9e5e58fa1a4c3b915a561a78a22ee0cac6ab97dca2504428bc1cb074375f8d5"
 "checksum lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b585b7a6811fb03aa10e74b278a0f00f8dd9b45dc681f148bb29fa5cb61859b"
 "checksum libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "d1419b2939a0bc44b77feb34661583c7546b532b192feab36249ab584b86856c"
 "checksum libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "a2aa04ec0100812d31a5366130ff9e793291787bc31da845bede4a00ea329830"
@@ -1408,7 +1436,7 @@ dependencies = [
 "checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba"
 "checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
 "checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0"
-"checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584"
+"checksum num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "514f0d73e64be53ff320680ca671b64fe3fb91da01e1ae2ddc99eb51d453b20d"
 "checksum odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "c3df9b730298cea3a1c3faa90b7e2f9df3a9c400d0936d6015e6165734eefcba"
 "checksum openssh-keys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a1af844e3f3f7742b5a8edbc0e5af0fe4b3a0b4172f6ec0c261fed74765dde8c"
 "checksum openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "816914b22eb15671d62c73442a51978f311e911d6a6f6cbdafa6abce1b5038fc"
@@ -1423,13 +1451,15 @@ dependencies = [
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "eb250fd207a4729c976794d03db689c9be1d634ab5a1c9da9492a13d8fecbcdf"
 "checksum redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "8dde11f18c108289bef24469638a04dce49da56084f2d50618b226e47eb04509"
+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
 "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
+"checksum relay 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f301bafeb60867c85170031bdb2fcf24c8041f33aee09e7b116a58d4e9f781c5"
 "checksum reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5866613d84e2a39c0479a960bf2d0eff1fbfc934f02cd42b5c08c1e1efc5b1fd"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
 "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
-"checksum schannel 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "14a5f8491ae5fc8c51aded1f5806282a0218b4d69b1b76913a0559507e559b90"
+"checksum schannel 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7554288337c1110e34d7a2433518d889374c1de1a45f856b7bcddb03702131fc"
 "checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d"
 "checksum secur32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f412dfa83308d893101dd59c10d6fda8283465976c28c287c5c855bf8d216bc"
 "checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332"
@@ -1462,6 +1492,7 @@ dependencies = [
 "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
 "checksum textwrap 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8e08afc40ae3459e4838f303e465aa50d823df8d7f83ca88108f6d3afe7edd"
 "checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
 "checksum time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d788d3aa77bc0ef3e9621256885555368b47bd495c13dd2e7413c89f845520"
@@ -1481,7 +1512,7 @@ dependencies = [
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum update-ssh-keys 0.1.0 (git+https://github.com/sdemos/update-ssh-keys-rs)" = "<none>"
 "checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27"
-"checksum users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7d8fb16f17ce0e6a18a25ce39f08edb5fbe9a25f3f346c9dca5e6ffc0485cdf"
+"checksum users 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "99ab1b53affc9f75f57da4a8b051a188e84d20d43bea0dd9bd8db71eebbca6da"
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
 "checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b"
 "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"

From c859909a090697fb0a1c3d697bd0948b82cb7cd2 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Mon, 16 Oct 2017 16:03:29 -0700
Subject: [PATCH 69/71] cargo: bump package version to 1.0.0

this is a major update over the previous version of coreos-metadata
---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8be0e2e5..ec1b212a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 [root]
 name = "coreos-metadata"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index fa316e85..ac9e9642 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "coreos-metadata"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Stephen Demos <stephen.demos@coreos.com>"]
 
 [[bin]]

From ee379c6aa10714b393a0f871caf111f3863076e7 Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Wed, 18 Oct 2017 11:58:39 -0700
Subject: [PATCH 70/71] cargo: update dependencies

in particular, update update-ssh-keys to the latest version
---
 Cargo.lock | 209 ++++++++++++++++++++++++++++++++---------------------
 Cargo.toml |  12 +--
 2 files changed, 134 insertions(+), 87 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ec1b212a..bf008011 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,17 +10,17 @@ dependencies = [
  "hostname 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "mockito 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssh-keys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-xml-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -72,7 +72,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -110,6 +110,11 @@ dependencies = [
  "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "build_const"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byte-tools"
 version = "0.2.0"
@@ -126,7 +131,7 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -136,12 +141,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -214,7 +219,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -222,9 +227,23 @@ name = "core-foundation-sys"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crc"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "build_const 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "crc-core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "crossbeam"
 version = "0.2.10"
@@ -259,7 +278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "either"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -283,10 +302,26 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "fuchsia-zircon"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fuchsia-zircon-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-zircon-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "futures"
 version = "0.1.16"
@@ -294,7 +329,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "futures-cpupool"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -311,7 +346,7 @@ name = "generic-array"
 version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nodrop 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "typenum 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -330,7 +365,7 @@ name = "hostname"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "winutil 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -340,7 +375,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -356,15 +391,15 @@ dependencies = [
  "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "relay 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -379,7 +414,7 @@ dependencies = [
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tls 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -397,10 +432,10 @@ dependencies = [
 
 [[package]]
 name = "iovec"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -411,11 +446,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "isatty"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -424,7 +459,7 @@ name = "itertools"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "either 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -467,16 +502,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.31"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libflate"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "adler32 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -511,12 +547,12 @@ name = "memchr"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "mime"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -527,10 +563,10 @@ name = "mio"
 version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -558,9 +594,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "http-muncher 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -568,7 +604,7 @@ name = "native-tls"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "schannel 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -582,7 +618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -594,13 +630,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "nodrop"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -643,7 +679,7 @@ name = "num_cpus"
 version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -664,23 +700,23 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.9.19"
+version = "0.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.19"
+version = "0.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -702,7 +738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pnet_macros_support 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -746,11 +782,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rand"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
- "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -800,13 +836,13 @@ dependencies = [
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libflate 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tls 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -865,7 +901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -875,7 +911,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -932,7 +968,7 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -969,6 +1005,11 @@ name = "slab"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "slab"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "slog"
 version = "2.0.12"
@@ -1000,7 +1041,7 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "isatty 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1048,7 +1089,7 @@ name = "syntex_errors"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1070,7 +1111,7 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1094,7 +1135,7 @@ name = "tempdir"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1112,7 +1153,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1121,7 +1162,7 @@ name = "termion"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1150,23 +1191,23 @@ version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-core"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1188,11 +1229,11 @@ dependencies = [
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1212,7 +1253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1300,7 +1341,7 @@ name = "users"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1372,11 +1413,12 @@ dependencies = [
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
 "checksum block-buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1339a1042f5d9f295737ad4d9a6ab6bf81c84a933dba110b9200cd6d1448b814"
+"checksum build_const 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e90dc84f5e62d2ebe7676b83c22d33b6db8bd27340fb6ffbff0a364efa0cb9c9"
 "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
 "checksum byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d"
 "checksum bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d828f97b58cc5de3e40c421d0cf2132d6b2da4ee0e11b8632fa838f0f9333ad6"
 "checksum cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "be1057b8462184f634c3a208ee35b0f935cfd94b694b26deadccd98732088d7b"
-"checksum cc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7db2f146208d7e0fbee761b09cd65a7f51ccc38705d4e7262dad4d73b12a76b1"
+"checksum cc 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2c674f0870e3dbd4105184ea035acb1c32c8ae69939c9e228d2b11bbfe29efad"
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
 "checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
 "checksum clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3451e409013178663435d6f15fdb212f14ee4424a3d74f979d081d0a66b6f1f2"
@@ -1385,18 +1427,22 @@ dependencies = [
 "checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
 "checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
 "checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
+"checksum crc 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fba69ea0e15e720f7e1cfe1cf3bc55007fbd41e32b8ae11cfa343e7e5961e79a"
+"checksum crc-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "003d1170779d405378223470f5864b41b79a91969be1260e4de7b4ec069af69c"
 "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
 "checksum crypt32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e34988f7e069e0b2f3bfc064295161e489b2d4e04a2e4248fb94360cdf00b4ec"
 "checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
 "checksum digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e5b29bf156f3f4b3c4f610a25ff69370616ae6e0657d416de22645483e72af0a"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
-"checksum either 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbee135e9245416869bf52bd6ccc9b59e2482651510784e089b874272f02a252"
+"checksum either 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e311a7479512fbdf858fb54d91ec59f3b9f85bc0113659f46bba12b199d273ce"
 "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
 "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
 "checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
+"checksum fuchsia-zircon 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f6c0581a4e363262e52b87f59ee2afe3415361c6ec35e665924eb08afe8ff159"
+"checksum fuchsia-zircon-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "43f3795b4bae048dc6123a6b972cadde2e676f9ded08aef6bb77f5f157684a82"
 "checksum futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "05a23db7bd162d4e8265968602930c476f688f0c180b44bdaf55e0cb2c687558"
-"checksum futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "77d49e7de8b91b20d6fda43eea906637eff18b96702eb6b2872df8bfab1ad2b5"
+"checksum futures-cpupool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "e86f49cc0d92fe1b97a5980ec32d56208272cbb00f15044ea9e2799dde766fdf"
 "checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
 "checksum generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fceb69994e330afed50c93524be68c42fa898c2d9fd4ee8da03bd7363acd26f2"
 "checksum getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "65922871abd2f101a2eb0eaebadc66668e54a87ad9c3dd82520b5f86ede5eff9"
@@ -1407,9 +1453,9 @@ dependencies = [
 "checksum hyper 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1b45eac8b696d59491b079bd04fcb0f3488c0f6ed62dcb36bcfea8a543e9cdc3"
 "checksum hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c81fa95203e2a6087242c38691a0210f23e9f3f8f944350bd676522132e2985"
 "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
-"checksum iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29d062ee61fccdf25be172e70f34c9f6efc597e1fb8f6526e8437b2046ab26be"
+"checksum iovec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6e8b9c2247fcf6c6a1151f1156932be5606c9fd6f55a2d7f9fc1cb29386b2f7"
 "checksum ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)" = "2134e210e2a024b5684f90e1556d5f71a1ce7f8b12e9ac9924c67fb36f63b336"
-"checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
+"checksum isatty 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "00c9301a947a2eaee7ce2556b80285dcc89558d07088962e6e8b9c25730f9dc6"
 "checksum itertools 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d3f2be4da1690a039e9ae5fd575f706a63ad5a2120f161b1d653c9da3930dd21"
 "checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
 "checksum kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e014dab1082fd9d80ea1fa6fcb261b47ed3eb511612a14198bb507701add083e"
@@ -1417,21 +1463,21 @@ dependencies = [
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c9e5e58fa1a4c3b915a561a78a22ee0cac6ab97dca2504428bc1cb074375f8d5"
 "checksum lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b585b7a6811fb03aa10e74b278a0f00f8dd9b45dc681f148bb29fa5cb61859b"
-"checksum libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "d1419b2939a0bc44b77feb34661583c7546b532b192feab36249ab584b86856c"
-"checksum libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "a2aa04ec0100812d31a5366130ff9e793291787bc31da845bede4a00ea329830"
+"checksum libc 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "56cce3130fd040c28df6f495c8492e5ec5808fb4c9093c310df02b0c8f030148"
+"checksum libflate 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ae46bcdafa496981e996e57c5be82c0a7f130a071323764c6faa4803619f1e67"
 "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
 "checksum magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf0336886480e671965f794bc9b6fce88503563013d1bfb7a502c81fe3ac527"
 "checksum magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40d014c7011ac470ae28e2f76a02bfea4a8480f73e701353b49ad7a8d75f4699"
 "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
 "checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
-"checksum mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e3d709ffbb330e1566dc2f2a3c9b58a5ad4a381f740b810cd305dc3f089bc160"
+"checksum mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e2e00e17be181010a91dbfefb01660b17311059dc8c7f48b9017677721e732bd"
 "checksum mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "dbd91d3bfbceb13897065e97b2ef177a09a438cb33612b2d371bf568819a9313"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 "checksum mockito 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c1b79c374f7fb89af61c1d49086c824a1c2abe9cfcfe6b182980959b70fb4b4a"
 "checksum native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04b781c9134a954c84f0594b9ab3f5606abc516030388e8511887ef4c204a1e5"
 "checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
 "checksum nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32"
-"checksum nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "52cd74cd09beba596430cc6e3091b74007169a56246e1262f0ba451ea95117b2"
+"checksum nodrop 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c20f62cbc112bb5beabe96e420b34b17cb627edb03039930a37351520efc69ee"
 "checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525"
 "checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba"
 "checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
@@ -1439,8 +1485,8 @@ dependencies = [
 "checksum num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "514f0d73e64be53ff320680ca671b64fe3fb91da01e1ae2ddc99eb51d453b20d"
 "checksum odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "c3df9b730298cea3a1c3faa90b7e2f9df3a9c400d0936d6015e6165734eefcba"
 "checksum openssh-keys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a1af844e3f3f7742b5a8edbc0e5af0fe4b3a0b4172f6ec0c261fed74765dde8c"
-"checksum openssl 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "816914b22eb15671d62c73442a51978f311e911d6a6f6cbdafa6abce1b5038fc"
-"checksum openssl-sys 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4c63a7d559c1e5afa6d6a9e6fa34bbc5f800ffc9ae08b72c605420b0c4f5e8"
+"checksum openssl 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)" = "8bf434ff6117485dc16478d77a4f5c84eccc9c3645c4da8323b287ad6a15a638"
+"checksum openssl-sys 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)" = "0ad395f1cee51b64a8d07cc8063498dc7554db62d5f3ca87a67f4eed2791d0c8"
 "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356"
 "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
 "checksum pnet 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d0364bc9319e77afb74fa65f6c8b0d73b1d3208f289cd227678f10562730791"
@@ -1449,7 +1495,7 @@ dependencies = [
 "checksum pulldown-cmark 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "378e941dbd392c101f2cb88097fa4d7167bc421d4b88de3ff7dbee503bc3233b"
 "checksum quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
-"checksum rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "eb250fd207a4729c976794d03db689c9be1d634ab5a1c9da9492a13d8fecbcdf"
+"checksum rand 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "61efcbcd9fa8d8fbb07c84e34a8af18a1ff177b449689ad38a6e9457ecc7b2ae"
 "checksum redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "8dde11f18c108289bef24469638a04dce49da56084f2d50618b226e47eb04509"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
@@ -1471,10 +1517,11 @@ dependencies = [
 "checksum serde-xml-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c06881f4313eec67d4ecfcd8e14339f6042cfc0de4b1bd3ceae74c29d597f68"
 "checksum serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "1afcaae083fd1c46952a315062326bc9957f182358eb7da03b57ef1c688f7aa9"
 "checksum serde_derive_internals 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd381f6d01a6616cdba8530492d453b7761b456ba974e98768a18cad2cd76f58"
-"checksum serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d243424e06f9f9c39e3cd36147470fd340db785825e367625f79298a6ac6b7ac"
+"checksum serde_json 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ee28c1d94a7745259b767ca9e5b95d55bafbd3205ca3acb978cad84a6ed6bc62"
 "checksum serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce0fd303af908732989354c6f02e05e2e6d597152870f2c6990efb0577137480"
 "checksum sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d963c78ce367df26d7ea8b8cc655c651b42e8a1e584e869c1e17dae3ccb116a"
 "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
+"checksum slab 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdeff4cd9ecff59ec7e3744cbca73dfe5ac35c2aedb2cfba8a1c715a18912e9d"
 "checksum slog 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "717c886b5e7855cf2e434a2d73ff494d33aaa584fb48e3074affc7b66dcd290d"
 "checksum slog-async 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ad0c2eeab552a206f95303868338aa67041146da8f8978dba8343c2b29b8ec2"
 "checksum slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd3236e1818c147ed3003930289dc6457425aaca3a7dbb6b7f3032f075d865c5"
@@ -1496,7 +1543,7 @@ dependencies = [
 "checksum textwrap 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8e08afc40ae3459e4838f303e465aa50d823df8d7f83ca88108f6d3afe7edd"
 "checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
 "checksum time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d788d3aa77bc0ef3e9621256885555368b47bd495c13dd2e7413c89f845520"
-"checksum tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e85d419699ec4b71bfe35bbc25bb8771e52eff0471a7f75c853ad06e200b4f86"
+"checksum tokio-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c843a027f7c1df5f81e7734a0df3f67bf329411781ebf36393ce67beef6071e3"
 "checksum tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ab83e7adb5677e42e405fa4ceff75659d93c4d7d7dd22f52fcec59ee9f02af"
 "checksum tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389"
 "checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
diff --git a/Cargo.toml b/Cargo.toml
index ac9e9642..ec50f116 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,11 +8,11 @@ name = "coreos-metadata"
 path = "src/bin/coreos-metadata.rs"
 
 [dependencies]
-clap = "*"
-users = "*"
-slog-term = "*"
-slog-async = "*"
-slog-scope = "*"
+clap = "2.26"
+users = "0.6"
+slog-term = "2.2"
+slog-async = "2.1"
+slog-scope = "4.0"
 mime = "0.3"
 serde = "1.0"
 serde_derive = "1.0"
@@ -34,7 +34,7 @@ tempdir = "0.3"
 nix = "0.9"
 
 [dependencies.slog]
-version = "*"
+version = "2.0"
 features = ["max_level_trace"]
 
 [dev-dependencies]

From 823bc3e6980d2ca4243e8c915e2579a32722edfc Mon Sep 17 00:00:00 2001
From: Stephen Demos <stphndemos@gmail.com>
Date: Wed, 18 Oct 2017 13:07:41 -0700
Subject: [PATCH 71/71] cargo: update update-ssh-keys dependency

now that update-ssh-keys has been merged into the upstream
coreos/update-ssh-keys repository, we have to point there for the latest
updates. also, we pin ourselves to a tag in that repo so that our
dependencies are more predictable.
---
 Cargo.lock      | 6 +++---
 Cargo.toml      | 2 +-
 src/metadata.rs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bf008011..daa65035 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26,7 +26,7 @@ dependencies = [
  "slog-scope 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-term 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "update-ssh-keys 0.1.0 (git+https://github.com/sdemos/update-ssh-keys-rs)",
+ "update-ssh-keys 0.1.0 (git+https://github.com/coreos/update-ssh-keys?tag=v0.1.0)",
  "users 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1317,7 +1317,7 @@ dependencies = [
 [[package]]
 name = "update-ssh-keys"
 version = "0.1.0"
-source = "git+https://github.com/sdemos/update-ssh-keys-rs#3e42c7a12d37e48356cc313db7b779f88e0f2c98"
+source = "git+https://github.com/coreos/update-ssh-keys?tag=v0.1.0#fcbbf62deb7bbe1df527d71c8b6c0231cb1090cb"
 dependencies = [
  "clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1557,7 +1557,7 @@ dependencies = [
 "checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
 "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
-"checksum update-ssh-keys 0.1.0 (git+https://github.com/sdemos/update-ssh-keys-rs)" = "<none>"
+"checksum update-ssh-keys 0.1.0 (git+https://github.com/coreos/update-ssh-keys?tag=v0.1.0)" = "<none>"
 "checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27"
 "checksum users 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "99ab1b53affc9f75f57da4a8b051a188e84d20d43bea0dd9bd8db71eebbca6da"
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
diff --git a/Cargo.toml b/Cargo.toml
index ec50f116..cc7907f1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ reqwest = "0.7"
 hyper = "0.11"
 error-chain = { version = "0.11", default-features = false }
 openssh-keys = "0.1"
-update-ssh-keys = { git = "https://github.com/sdemos/update-ssh-keys-rs" }
+update-ssh-keys = { git = "https://github.com/coreos/update-ssh-keys", tag = "v0.1.0" }
 ipnetwork = "0.12"
 clippy = { version = "*", optional = true }
 hostname = "0.1"
diff --git a/src/metadata.rs b/src/metadata.rs
index 7511227d..06fe7bb9 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -136,7 +136,7 @@ impl Metadata {
         // find the ssh keys user and open their ssh authorized keys directory
         let user = users::get_user_by_name(&ssh_keys_user)
             .ok_or_else(|| format!("could not find user with username {:?}", ssh_keys_user))?;
-        let mut authorized_keys_dir = AuthorizedKeys::open(user, true)
+        let mut authorized_keys_dir = AuthorizedKeys::open(user, true, None)
             .chain_err(|| format!("failed to open authorzied keys directory for user '{}'", ssh_keys_user))?;
 
         // add the ssh keys to the directory