Bump github.com/coreos/butane from v0.26.0 to v0.27.0 (#1550)

Co-authored-by: dghubble-renovate[bot] <119624128+dghubble-renovate[bot]@users.noreply.github.com>

.dockerignore

@@ -1,4 +1,3 @@
-data/
-Godeps/
-assets/
-vagrant/
+bin/
+_output/
+

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Report a bug to improve the project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- READ: Issues are used to receive focused bug reports from users and to track planned future enhancements by the authors. Topics like support, debugging help, advice, and operation are out of scope and should not use issues-->
+
+**Description**
+
+A clear and concise description of what the bug is.
+
+**Steps to Reproduce**
+
+Provide clear steps to reproduce the bug.
+
+- [ ] Relevant error messages if appropriate (concise, not a dump of everything).
+
+**Expected behavior**
+
+A clear and concise description of what you expected to happen.
+
+**Environment**
+
+* OS: fedora-coreos, flatcar-linux (include release version)
+* Release: Matchbox version or Git SHA (reporting latest is **not** helpful)
+
+**Possible Solution**
+
+<!-- Most bug reports should have some inkling about solutions. Otherwise, your report may be less of a bug and more of a support request (see top).-->
+
+Link to a PR or description.
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Security
+    url: https://typhoon.psdn.io/topics/security/
+    about: Report security vulnerabilities

.github/dependabot.yaml

@@ -0,0 +1,18 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "daily"
+- package-ecosystem: gomod
+  directory: "/"
+  schedule:
+    interval: daily
+- package-ecosystem: docker
+  directory: "/"
+  schedule:
+    interval: daily
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: weekly

.github/release.yaml

@@ -0,0 +1,12 @@
+changelog:
+  categories:
+    - title: Contributions
+      labels:
+        - '*'
+      exclude:
+        labels:
+          - dependencies
+          - no-release-note
+    - title: Dependencies
+      labels:
+        - dependencies

.github/workflows/build.yaml

@@ -0,0 +1,15 @@
+name: build
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+jobs:
+  go:
+    uses: poseidon/.github/.github/workflows/golang-library.yaml@main
+  multiarch:
+    uses: poseidon/fleetlock/.github/workflows/multiarch.yaml@main
+    secrets:
+      QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}

.github/workflows/mkdocs-pages.yaml

@@ -0,0 +1,26 @@
+name: mkdocs-pages
+on:
+  workflow_call:
+jobs:
+  publish:
+    name: publish
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout repo to GitHub Actions runner
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      # Install Python
+      - name: Setup Python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        with:
+          python-version: 3.x
+
+      # Install PyPI packages
+      - name: Dependencies
+        run: pip install -r requirements.txt
+
+      # Push to GitHub Pages
+      - name: Push Docs
+        run: |
+          mkdocs gh-deploy --force

.github/workflows/publish.yaml

@@ -0,0 +1,13 @@
+name: publish
+on:
+  push:
+    branches:
+      - release-docs
+jobs:
+  mkdocs:
+    name: mkdocs
+    uses: ./.github/workflows/mkdocs-pages.yaml
+    # Add content write for GitHub Pages
+    permissions:
+      contents: write
+

.github/workflows/summary.yaml

@@ -0,0 +1,8 @@
+name: summary
+on:
+  pull_request:
+jobs:
+  enforce:
+    uses: ./.github/workflows/wait-for-status-checks.yaml
+    permissions:
+      checks: read

.github/workflows/wait-for-status-checks.yaml

@@ -0,0 +1,16 @@
+name: wait-for-status-checks
+on:
+  workflow_call:
+jobs:
+  status-checks:
+    runs-on: ubuntu-slim
+    permissions:
+      checks: read
+    steps:
+      - name: GitHub Checks
+        uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          # wait-for-status-checks ignores it's own check name, but it does
+          # not know the full name when used inside a reusable workflow
+          ignore: "enforce / status-checks"

.gitignore

@@ -26,6 +26,10 @@ _testmain.go
 *.test
 *.prof
 
-bin/
+*.aci
 assets/
-*.aci
+bin/
+_output/
+tools/
+contrib/registry/data
+contrib/rpm/*.tar.gz

.travis.yml

@@ -1,26 +0,0 @@
-language: go
-sudo: required
-services:
-  - docker
-go:
-  - 1.5.3
-  - tip
-install:
-  - go get golang.org/x/tools/cmd/vet
-  - go get github.com/golang/lint/golint
-  - go get -v -t ./...
-script:
-  - go test ./...
-  - go vet ./...
-  - golint ./...
-  - test -z "$(go fmt ./...)"
-deploy:
-  provider: script
-  script: scripts/travis-docker-push
-  skip_cleanup: true
-  on:
-    branch: master
-    go: '1.5.3'
-    condition: "$TRAVIS_PULL_REQUEST = false"
-notifications:
-  email: false

CHANGES.md

@@ -1,14 +1,330 @@
-# coreos-baremetal bootcfg
+# Matchbox
+
+Notable changes between releases.
 
 ## Latest
 
+## v0.11.0
+
+* Update butane from v0.17.0 to v0.18.0 ([#1079](https://github.com/poseidon/matchbox/pull/1079))
+  * Add support for `fcos` [v1.5.0](https://coreos.github.io/butane/config-fcos-v1_5/) Butane Configs
+  * Add support for `flatcar` [v1.1.0](https://coreos.github.io/butane/config-flatcar-v1_1/) Butane Configs
+  * Render Ignition as Ignition spec [v3.4.0](https://coreos.github.io/ignition/configuration-v3_4/)
+
+## v0.10.0
+
+* Remove support for Ignition v0.35.0 (Ignition spec v2.x)
+* Remove support for Container Linux Configs (**action required**)
+  * Container Linux Configs were a YAML format that rendered to Ignition (spec v2.x)
+  * Flatcar Linux now supports Ignition v2 (spec v3.x)
+  * Butane is a suitable YAML format that renders Ignition v2 (spec v3.x)
+* Upgrade Ignition from v0.35.0 (spec v2.x) to v2.14.0 (spec v3.x)
+* Update Go version (v1.20.2) and alpine base image (v3.17.3)
+* Add limited support for Matchbox rendering Butane configs ([#997](https://github.com/poseidon/matchbox/pull/997)) ([docs](https://matchbox.psdn.io/ignition/#matchbox-rendering))
+* Recommend writing Butane via external tools (**action required**)
+  * For Terraform, use [poseidon/terraform-provider-ct](https://github.com/poseidon/terraform-provider-ct)
+  * For a CLI, use [`butane`](https://github.com/coreos/butane)
+* Parse Ignition and render forward to Ignition v2 (spec v3.3)
+  * Ignition is [forward](https://github.com/coreos/ignition/blob/main/config/v3_3/config.go#L61) compatible (e.g. a `v3.1` spec can be rendered as `v3.3` safely)
+
+If you still template Container Linux Configs via Matchbox, [migrate](https://www.flatcar.org/docs/latest/provisioning/config-transpiler/) to Butane by prepending:
+
+```yaml
+variant: flatcar
+version: 1.0.0
+```
+
+## v0.9.1
+
+* Add dependabot Go module update automation ([#833](https://github.com/poseidon/matchbox/pull/833))
+* Build multi-arch container images (amd64, arm64) ([#823](https://github.com/poseidon/matchbox/pull/823))
+* Update Go version (v1.18.4) and alpine base image (v3.16.1)
+* Move `dnsmasq` container image to its own [repo](https://github.com/poseidon/dnsmasq) ([#840](https://github.com/poseidon/matchbox/pull/840))
+* Deprecate rendering Container Linux Configs
+  * Please migrate to serving CoreOS Ignition directly
+  * Use tools like [poseidon/ct](https://github.com/poseidon/terraform-provider-ct) or [butane](https://coreos.github.io/butane/getting-started/) to validate and convert a Butane Config (`focs` or `flatcar`) to Ignition (for Matchbox to serve)
+
+### Docs/Examples
+
+* Migrate docs website to GitHub Pages ([#976](https://github.com/poseidon/matchbox/pull/976))
+* Update Fedora CoreOS images and configuration ([#972](https://github.com/poseidon/matchbox/pull/972))
+* Update Fedora CoreOS initrd karg for UEFI ([#978](https://github.com/poseidon/matchbox/pull/978))
+* Update Flatcar Linux examples to use Ignition v3.3.0 ([#980](https://github.com/poseidon/matchbox/pull/980))
+
+## v0.9.0
+
+* Refresh docs and examples for Fedora CoreOS and Flatcar Linux ([#815](https://github.com/poseidon/matchbox/pull/815), [#816](https://github.com/poseidon/matchbox/pull/816))
+* Update Kubernetes manifest examples ([#791](https://github.com/poseidon/matchbox/pull/791), [#817](https://github.com/poseidon/matchbox/pull/817))
+* Update Matchbox container image publishing ([#795](https://github.com/poseidon/matchbox/pull/795))
+  * Publish Matchbox images from internal infra to Quay (`quay.io/poseidon/matchbox`)
+  * Update Go version from v1.13.4 to v1.14.9
+  * Update base image from `alpine:3.10` to `alpine:3.12` ([#784](https://github.com/poseidon/matchbox/pull/784))
+* Include `contrib/k8s` in release tarballs ([#788](https://github.com/poseidon/matchbox/pull/788))
+* Remove outdated systemd units ([#817](https://github.com/poseidon/matchbox/pull/817))
+* Remove RPM spec file (Copr publishing stopped in v0.6)
+
+## v0.8.3
+
+* Publish docs to [https://matchbox.psdn.io](https://matchbox.psdn.io/) ([#769](https://github.com/poseidon/matchbox/pull/769))
+* Update Go version from v1.11.7 to v1.13.4 ([#766](https://github.com/poseidon/matchbox/pull/766), [#770](https://github.com/poseidon/matchbox/pull/770))
+* Update container image base from `alpine:3.9` to `alpine:3.10` ([#761](https://github.com/poseidon/matchbox/pull/761))
+* Include `get-fedora-coreos` convenience script ([#763](https://github.com/poseidon/matchbox/pull/763))
+* Remove Kubernetes provisioning examples ([#759](https://github.com/poseidon/matchbox/pull/759))
+* Remove rkt tutorials and docs ([#765](https://github.com/poseidon/matchbox/pull/765))
+
+## v0.8.1 - v0.8.2
+
+Releases `v0.8.1` and `v0.8.2` were not built cleanly
+
+* Release tags and container images have been removed
+* Caused by go get golint (module-aware) mutating `go.mod` on Travis (see [#775](https://github.com/poseidon/matchbox/pull/775), [#777](https://github.com/poseidon/matchbox/pull/777))
+
+## v0.8.0
+
+* Transfer Matchbox repo from coreos to poseidon GitHub Org
+* Publish container images at [quay.io/poseidon/matchbox](https://quay.io/repository/poseidon/matchbox)
+* Build Matchbox with Go v1.11.7 for images and binaries
+* Update container image base from alpine:3.6 to alpine:3.9
+* Render Container Linux Configs as Ignition v2.2.0
+* Validate raw Ignition configs with the v2.2 spec (warn-only)
+  * Fix warnings that v2.2 configs are too new
+
+Note: Release signing key [has changed](https://github.com/poseidon/matchbox/blob/v0.8.0/Documentation/deployment.md) with the project move.
+
+### Examples
+
+* Update Kubernetes example clusters to v1.14.1 (Terraform-based)
+
+## v0.7.1 (2018-11-01)
+
+* Add `kernel_args` variable to the terraform bootkube-install cluster definition
+* Add `get-flatcar` helper script
+* Add optional TLS support to read-only HTTP API
+* Build Matchbox with Go 1.11.1 for images and binaries
+
+### Examples
+
+* Upgrade Kubernetes example clusters to v1.10.0 (Terraform-based)
+* Upgrade Kubernetes example clusters to v1.8.5
+
+## v0.7.0 (2017-12-12)
+
+* Add gRPC API endpoints for managing generic (experimental) templates
+* Update Container Linux config transpiler to v0.5.0
+* Update Ignition to v0.19.0, render v2.1.0 Ignition configs
+* Drop support for Container Linux versions below 1465.0.0 (breaking)
+* Build Matchbox with Go 1.8.5 for images and binaries
+* Remove Profile `Cmdline` map (deprecated in v0.5.0), use `Args` slice instead
+* Remove pixiecore support (deprecated in v0.5.0)
+* Remove `ContextHandler`, `ContextHandlerFunc`, and `NewHandler` from the `matchbox/http` package.
+
+### Examples / Modules
+
+* Upgrade Kubernetes example clusters to v1.8.4
+* Kubernetes examples clusters enable etcd TLS
+* Deploy the Container Linux Update Operator (CLUO) to coordinate reboots of Container Linux nodes in Kubernetes clusters. See the cluster [addon docs](Documentation/cluster-addons.md).
+* Kubernetes examples (terraform and non-terraform) mask locksmithd
+* Terraform modules `bootkube` and `profiles` (Kubernetes) mask locksmithd
+
+## v0.6.1 (2017-05-25)
+
+* Improve the installation documentation
+* Move examples/etc/matchbox/cert-gen to scripts/tls
+* Build Matchbox with Go 1.8.3 for images and binaries
+
+### Examples
+
+* Upgrade self-hosted Kubernetes cluster examples to v1.6.4
+* Add NoSchedule taint to self-hosted Kubernetes controllers
+* Remove static Kubernetes and rktnetes cluster examples
+
+## v0.6.0 (2017-04-25)
+
+* New [terraform-provider-matchbox](https://github.com/coreos/terraform-provider-matchbox) plugin for Terraform users!
+* New hosted [documentation](https://coreos.com/matchbox/docs/latest) on coreos.com
+* Add `ProfileDelete`, `GroupDelete`, `IgnitionGet` and `IgnitionDelete` gRPC endpoints
+* Build matchbox with Go 1.8 for container images and binaries
+* Generate code with gRPC v1.2.1 and matching Go protoc-gen-go plugin
+* Update Ignition to v0.14.0 and coreos-cloudinit to v1.13.0
+* Update "fuze" docs to the new name [Container Linux Configs](https://coreos.com/os/docs/latest/configuration.html)
+* Remove `bootcmd` binary from release tarballs
+
+### Examples
+
+* Upgrade Kubernetes v1.5.5 (static) example clusters
+* Upgrade Kubernetes v1.6.1 (self-hosted) example cluster
+* Use etcd3 by default in all clusters (remove etcd2 clusters)
+* Add Terraform examples for etcd3 and self-hosted Kubernetes 1.6.1
+
+## v0.5.0 (2017-01-23)
+
+* Rename project to CoreOS `matchbox`!
+* Add Profile `args` field to list kernel args
+* Update [Fuze](https://github.com/coreos/container-linux-config-transpiler) and [Ignition](https://github.com/coreos/ignition) to v0.11.2
+* Switch from `golang.org/x/net/context` to `context`
+* Deprecate Profile `cmd` field map of kernel args
+* Deprecate Pixiecore support
+* Drop build support for Go 1.6
+
+#### Rename
+
+* Move repo from github.com/coreos/coreos-baremetal to github.com/coreos/matchbox
+* Rename `bootcfg` binary to `matchbox`
+* Rename `bootcfg` packages to `matchbox`
+* Publish a `quay.io/coreos/matchbox` container image. The `quay.io/coreos/bootcfg` image will no longer be updated.
+* Rename environment variable prefix from `BOOTCFG*` to `MATCHBOX*`
+* Change config directory to `/etc/matchbox`
+* Change default `-data-path` to `/var/lib/matchbox`
+* Change default `-assets-path` to `/var/lib/matchbox/assets`
+
+#### Examples
+
+* Upgrade Kubernetes v1.5.1 (static) example clusters
+* Upgrade Kubernetes v1.5.1 (self-hosted) example cluster
+* Switch Kubernetes (self-hosted) to run flannel as pods
+* Combine rktnetes Ignition into Kubernetes static cluster
+
+#### Migration
+
+* binary users should install the `matchbox` binary (see [installation](Documentation/deployment.md))
+* rkt/docker users should start using `quay.io/coreos/matchbox` (see [installation](Documentation/deployment.md))
+* RPM users should uninstall bootcfg and install matchbox (see [installation](Documentation/deployment.md))
+* Move `/etc/bootcfg` configs and certificates to `/etc/matchbox`
+* Move `/var/lib/bootcfg` data to `/var/lib/matchbox`
+* See the new [contrib/systemd](contrib/systemd) service examples
+* Remove the old `bootcfg` user if you created one
+
+## v0.4.2 (2016-12-7)
+
+#### Improvements
+
+* Add RPM packages to Copr
+* Fix packaged `contrib/systemd` units
+* Update Go version to 1.7.4
+
+#### Examples
+
+* Upgrade Kubernetes v1.4.6 (static manifest) example clusters
+* Upgrade Kubernetes v1.4.6 (rktnetes) example clusters
+* Upgrade Kubernetes v1.4.6 (self-hosted) example cluster
+
+## v0.4.1 (2016-10-17)
+
+#### Improvements
+
+* Add ARM and ARM64 release architectures (#309)
+* Add guide for installing bootcfg on CoreOS (#306)
+* Improvements to the bootcfg cert-gen script (#310)
+
+#### Examples
+
+* Add Kubernetes example with rkt container runtime (i.e. rktnetes)
+* Upgrade Kubernetes v1.4.1 (static manifest) example clusters
+* Upgrade Kubernetes v1.4.1 (rktnetes) example clusters
+* Upgrade Kubernetes v1.4.1 (self-hosted) example cluster
+* Add etcd3 example cluster (PXE in-RAM or install to disk)
+* Use DNS names (instead of IPs) in example clusters (except bootkube)
+
+## v0.4.0 (2016-07-21)
+
+#### Features
+
+* Add/improve rkt, Docker, Kubernetes, and binary/systemd deployment docs
+* TLS Client Authentication:
+    * Add gRPC API TLS and TLS client-to-server authentication (#140)
+    * Enable gRPC API by providing a TLS server `-cert-file` and `-key-file`, and a `-ca-file` to authenticate client certificates
+    * Provide the `bootcmd` tool a TLS client `-cert-file` and `-key-file`, and a `-ca-file` to verify the server identity.
+* Improvements to Ignition Support:
+    * Allow Fuze YAML template files for Ignition 2.0.0 (#141)
+    * Stop requiring Ignition templates to use file extensions (#176)
+* Logging Improvements:
+    * Add structured logging with Logrus (#254, #268)
+    * Log requests for bootcfg assets (#214)
+    * Show `bootcfg` message at the home path `/`
+    * Fix http package log messages (#173)
+* Templating:
+    * Allow query parameters to be used as template variables as `{{.request.query.foo}}` (#182)
+    * Support nested maps in responses from the "env file" metadata endpoint (#84)
+    * Error when a template is rendered with variables which are missing a referenced key. Previously, missing lookups defaulted to "no value" (#210)
+* gRPC API
+    * Add DialTimeout to gRPC client config (#273)
+    * Add IgnitionPut and Close to the client (#160,#193)
+
+#### Changes
+
+* gRPC API requires TLS client authentication
+* Replace Ignition YAML templates with Fuze templates
+    - Fuze formalizes the transform from Fuze configs (YAML) to Ignition 2.0.0 (JSON)
+    - [Migrate templates from v0.3.0](Documentation/ignition.md#migration-from-v030)
+    - Require CoreOS 1010.1.0 or newer
+    - Drop support for Ignition v1 format
+* Replace template variable `{{.query}}` with `{{.request.raw_query}}`
+
+#### Examples
+
+* Kubernetes
+    * Upgrade Kubernetes v1.3.0 (static manifest) example clusters
+    * Add Kubernetes v1.3.0-beta.2 (self-hosted) example cluster
+    * Mount /etc/resolv.conf into host kubelet for skydns and pod DNS lookups (#237,#260)
+    * Fix a bug in the k8s example k8s-certs@.service file check (#156)
+    * Avoid systemd dependency failures by restarting components (#257,#274)
+    * Verify Kubernetes v1.2.4 and v1.3.0 clusters pass conformance tests (#71,#265)
+* Add Torus distributed storage cluster example (PXE boot)
+* Add `create-uefi` subcommand to `scripts/libvirt` for UEFI/GRUB testing
+* Install CoreOS to disk from a cached copy via bootcfg baseurl (#228)
+* Remove 8.8.8.8 from networkd example Ignition configs (#184)
+* Match machines by MAC address in examples to simplify networkd device matching (#209)
+* With rkt 1.8+, you can use `rkt gc --grace-period=0` to cleanup rkt IP assignments in examples. The `rkt-gc-force` script has been removed.
+
+## v0.3.0 (2016-04-14)
+
+#### Features
+
+* Add server library package for implementing servers
+* Add initial gRPC client/server and a CLI tool
+    - Allow listing, viewing, and creating Groups and Profiles
+* Add initial Grub net boot support examples
+* Add detached OpenPGP signature endpoints (`.sig`)
+* Document deployment as a binary with systemd
+* Upgrade from Go 1.5.3 to Go 1.6.1 (#139)
+
+#### Changes
+
+* Profiles
+    - Move Profiles to JSON files under `/var/lib/bootcfg/profiles`
+    - Rename `Spec` to `Profile` (#104)
+* Groups
+    - Move Groups to JSON files under `/var/lib/bootcfg/groups`
+    - Require Group metadata to be valid JSON
+    - Rename Group field `spec` to `profile`
+    - Rename Group field `require` to `selector` (#147)
+* Allow asset serving to be disabled with `-assets-path=""` (#118)
+* Allow `selector` key/value pairs to be used in Ignition and Cloud config templates (#64)
+* Change default `-data-path` to `/var/lib/bootcfg` (#132)
+* Change default `-assets-path` to `/var/lib/bootcfg/assets` (#132)
+* Change the default assets download location to `examples/assets`
+* Stop parsing Groups from the `-config` YAML file. Remove the flag.
+* Remove HTTP `/spec/id` JSON endpoint
+
+#### Examples
+
+* Convert all Cloud-Configs to Ignition
+* Kubernetes
+    * Upgraded Kubernetes examples to v1.2.0 (#122)
+    * Run Heapster service by default (#142)
+    * Example multi-node Kubernetes cluster installed to disk
+* Example multi-node etcd cluster installed to disk
+* Example which PXE boots with or without a root partition
+* Setup fleet in multi-node example clusters
+
+
 ## v0.2.0 (2016-02-09)
 
 #### Features
 
 * Render Ignition config and cloud-configs as Go templates
 * Allow writing Ignition configs as YAML configs. Render as JSON for machines.
-* Add detached OpenPGP signature endpoints (`.asc`) for all configs.
+* Add ASCII armored detached OpenPGP signature endpoints (`.asc`)
     - Enable signing by providing a `-key-ring-path` with a signing key and setting `BOOTCFG_PASSPHRASE` if needed
 * Add `metadata` endpoint which matches machines to custom metadata
 * Add `metadata` to group definitions in `config.yaml`

CONTRIBUTING.md

@@ -1,77 +1,5 @@
-# How to Contribute
+# Contributing
 
-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.
+## Developer Certificate of Origin
 
-# 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.
-
-## 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.
+By contributing, you agree to the Linux Foundation's Developer Certificate of Origin ([DCO](DCO)). The DCO is a statement that you, the contributor, have the legal right to make your contribution and understand the contribution will be distributed as part of this project.

Dockerfile

@@ -1,5 +1,13 @@
-FROM alpine:latest
-MAINTAINER Dalton Hubble <dalton.hubble@coreos.com>
-COPY bin/bootcfg /bootcfg
+FROM docker.io/golang:1.26.0 AS builder
+COPY . src
+RUN cd src && make build
+
+FROM docker.io/alpine:3.23.3
+LABEL maintainer="Dalton Hubble <dghubble@gmail.com>"
+LABEL org.opencontainers.image.title="Matchbox",
+LABEL org.opencontainers.image.source="https://github.com/poseidon/matchbox"
+LABEL org.opencontainers.image.documentation="https://matchbox.psdn.io"
+LABEL org.opencontainers.image.vendor="Poseidon Labs"
+COPY --from=builder /go/src/bin/matchbox /matchbox
 EXPOSE 8080
-ENTRYPOINT ["/bootcfg"]
+ENTRYPOINT ["/matchbox"]

Documentation/api.md

@@ -1,200 +0,0 @@
-
-# API
-
-## iPXE Script
-
-Serves a static iPXE boot script which gathers client machine attributes and chainloads to the iPXE endpoint. Configure your DHCP server or iPXE server to boot from this script (e.g. set `dhcp-boot:dhcp-boot=tag:ipxe,http://bootcfg.domain.com/ipxe/boot.ipxe` if using `dnsmasq`).
-
-    GET http://bootcfg.foo/boot.ipxe
-    GET http://bootcfg.foo/boot.ipxe.0   // for dnsmasq
-
-**Response**
-
-    #!ipxe
-    chain ipxe?uuid=${uuid}&mac=${net0/mac:hexhyp}&domain=${domain}&hostname=${hostname}&serial=${serial}
-
-## iPXE
-
-Finds the spec matching the attribute query parameters and renders the spec boot settings (kernel, options, initrd) as an iPXE script.
-
-    GET http://bootcfg.foo/ipxe
-
-**Query Parameters**
-
-| Name | Type   | Description   |
-|------|--------|---------------|
-| uuid | string | Hardware UUID |
-| mac  | string | MAC address   |
-
-**Response**
-
-    #!ipxe
-    kernel /assets/coreos/899.6.0/coreos_production_pxe.vmlinuz cloud-config-url=http://bootcfg.foo:8080/cloud?uuid=${uuid}&mac=${net0/mac:hexhyp} coreos.autologin
-    initrd  /assets/coreos/899.6.0/coreos_production_pxe_image.cpio.gz
-    boot
-
-## Pixiecore
-
-Finds the spec matching the attribute query parameters and renders the boot settings as JSON to implement the Pixiecore API [spec](https://github.com/danderson/pixiecore/blob/master/README.api.md). Currently, Pixiecore only provides the machine's MAC address for matching.
-
-    GET http://bootcfg.foo/pixiecore/v1/boot/:MAC
-
-**URL Parameters**
-
-| Name | Type   | Description |
-|------|--------|-------------|
-| mac  | string | MAC address |
-
-**Response**
-
-    {
-      "kernel":"/assets/coreos/899.6.0/coreos_production_pxe.vmlinuz",
-      "initrd":["/assets/coreos/899.6.0/coreos_production_pxe_image.cpio.gz"],
-      "cmdline":{
-        "cloud-config-url":"http://bootcfg.foo/cloud?mac=ADDRESS",
-        "coreos.autologin":""
-      }
-    }
-
-## Cloud Config
-
-Finds the spec matching the attribute query parameters and renders the corresponding cloud-config file.
-
-    GET http://bootcfg.foo/cloud
-
-**Query Parameters**
-
-| Name | Type   | Description   |
-|------|--------|---------------|
-| uuid | string | Hardware UUID |
-| mac  | string | MAC address   |
-
-**Response**
-
-    #cloud-config
-    coreos:
-      units:
-        - name: etcd2.service
-          command: start
-        - name: fleet.service
-          command: start
-
-## Ignition Config
-
-Finds the spec matching the attribute query parameters and renders the corresponding Ignition config as JSON.
-
-    GET http://bootcfg.foo/ignition
-
-**Query Parameters**
-
-| Name | Type   | Description   |
-|------|--------|---------------|
-| uuid | string | Hardware UUID |
-| mac  | string | MAC address   |
-
-**Response**
-
-    {
-      "ignitionVersion": 1,
-      "storage": {},
-      "systemd": {
-        "units": [
-          {
-            "name": "hello.service",
-            "enable": true,
-            "contents": "[Service]\nType=oneshot\nExecStart=\/usr\/bin\/echo Hello World\n\n[Install]\nWantedBy=multi-user.target"
-          }
-        ]
-      },
-      "networkd": {},
-      "passwd": {}
-    }
-
-## OpenPGP Signatures
-
-OpenPGPG signature endpoints serve ASCII armored detached signatures of rendered configs when signing is enabled. See [OpenPGP Signing](openpgp.md).
-
-| Endpoint   | ASCII Signature Endpoint |
-|------------|-----------------|
-| Ignition   | `http://bootcfg.foo/ignition.asc` |
-| Cloud-init | `http://bootcfg.foo/cloud.asc` |
-| iPXE       | `http://bootcfg.foo/boot.ipxe.asc` |
-| iPXE       | `http://bootcfg.foo/ipxe.asc` |
-| Pixiecore  | `http://bootcfg.foo/pixiecore/v1/boot.asc/:MAC` |
-
-Get an Ignition config and its detached signature.
-
-    GET http://bootcfg.foo/ipxe?attribute=value
-
-**Response**
-
-    #!ipxe
-    kernel /assets/coreos/899.6.0/coreos_production_pxe.vmlinuz cloud-config-url=http://bootcfg.foo:8080/cloud?uuid=${uuid}&mac=${net0/mac:hexhyp} coreos.autologin
-    initrd  /assets/coreos/899.6.0/coreos_production_pxe_image.cpio.gz
-    boot
-
-    GET http://bootcfg.foo/ipxe.asc?attribute=value
-
-**Response**
-
-```
------BEGIN PGP SIGNATURE-----
-
-wsBcBAEBCAAQBQJWoDHyCRCzUpbPLRRcKAAAqQ8IAGD+eC9kzc/U7h9tgwvvWwm9
-suTmVSGlzC5RwTRXg6CKuW31m3WAin2b5zWRPa7MxxanYMhhBbOfrqg/4xi1tfdE
-w7ipmmgftl3re0np75Jt9K1rwGXUHTCs3yooz/zvqSvNSobG13FL5tp+Jl7a22wE
-+W7x9BukTytVgNLt3IDIxsJ/rAEYUm4zySftooDbFVKj/SK5w8xg4zLmE6Jxz6wp
-eaMlL1TEXy3NaFR0+hgbqM/tgeV2j6pmho8yaPF63iPnksH+gdmPiwasCfpSaJyr
-NO+p24BL3PHZyKw0nsrm275C913OxEVgnNZX7TQltaweW23Cd1YBNjcfb3zv+Zo=
-=mqZK
------END PGP SIGNATURE-----
-```
-
-## API Resources
-
-### Specs
-
-Get a `Spec` definition by id (UUID, MAC).
-
-    http://bootcfg.foo/spec/:id
-
-**URL Parameters**
-
-| Name | Type   | Description |
-|------|--------|-------------|
-| id   | string | spec identifier |
-
-**Response**
-
-```json
-{
-  "id": "etcd",
-  "boot": {
-    "kernel": "/assets/coreos/899.6.0/coreos_production_pxe.vmlinuz",
-    "initrd": [
-      "/assets/coreos/899.6.0/coreos_production_pxe_image.cpio.gz"
-    ],
-    "cmdline": {
-      "coreos.autologin": "",
-      "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}",
-      "coreos.first_boot": ""
-    }
-  },
-  "cloud_id": "",
-  "ignition_id": "etcd.yaml"
-}
-```
-
-## Assets
-
-If you need to serve static assets (e.g. kernel, initrd), `bootcfg` can serve arbitrary assets from `-assets-path` at `/assets/`.
-
-    assets/
-    └── coreos
-        └── 835.9.0
-            ├── coreos_production_pxe.vmlinuz
-            └── coreos_production_pxe_image.cpio.gz
-        └── 899.6.0
-            ├── coreos_production_pxe.vmlinuz
-            └── coreos_production_pxe_image.cpio.gz
-

Documentation/bootcfg.md

@@ -1,162 +0,0 @@
-
-# bootcfg
-
-`bootcfg` is an HTTP service that renders signed [Ignition configs](https://coreos.com/ignition/docs/latest/what-is-ignition.html), [cloud-configs](https://coreos.com/os/docs/latest/cloud-config.html), network boot configs, and metadata to machines to create clusters of CoreOS machines. The service maintains a list of **Specs** which are named sets of configuration data (e.g. Ignition config, cloud-config, kernel, initrd). When started, `bootcfg` loads a list of **Group** definitions, which match machines to Specs and metadata based on attributes (e.g. UUID, MAC address, stage) passed as query arguments.
-
-The aim is to use CoreOS Linux's early-boot capabilities to boot machines into functional cluster members with end to end [Distributed Trusted Computing](https://coreos.com/blog/coreos-trusted-computing.html). PXE, iPXE, and [Pixiecore](https://github.com/danderson/pixiecore/blob/master/README.api.md) endpoints provide support for network booting. The `bootcfg` service can be run as an [application container](https://github.com/appc/spec) with rkt, as a Docker container, or as a binary.
-
-## Usage
-
-Fetch the application container image (ACI) from [Quay](https://quay.io/repository/coreos/bootcfg?tab=tags).
-
-    sudo rkt --insecure-options=image fetch docker://quay.io/coreos/bootcfg
-
-Alternately, pull the Docker image.
-
-    sudo docker pull quay.io/coreos/bootcfg
-
-The `latest` image corresponds to the most recent commit on master, so choose a tagged [release](https://github.com/coreos/coreos-baremetal/releases) if you require more stability.
-
-Get started running `bootcfg` with rkt or Docker to network boot libvirt VMs on your laptop into CoreOS clusters.
-
-* [Getting Started with rkt](getting-started-rkt.md)
-* [Getting Started with Docker](getting-started-docker.md)
-
-Once you've tried those examples, you're ready to write your own configs.
-
-## Data
-
-A `Store` stores Ignition configs, cloud-configs, and named Specs. By default, `bootcfg` uses a `FileStore` to search a data directory (`-data-path`) for these resources.
-
-Prepare a data directory similar to the [examples](../examples) directory, with `ignition`, `cloud`, and `specs` subdirectories. You might keep this directory under version control since it will define the early boot behavior of your machines.
-
-     data
-     ├── config.yaml
-     ├── cloud
-     │   ├── cloud.yaml
-     │   └── worker.sh
-     ├── ignition
-     │   └── hello.json
-     │   └── etcd.yaml
-     │   └── simple_networking.yaml
-     └── specs
-         └── etcd
-             └── spec.json
-         └── worker
-             └── spec.json
-
-Ignition files can be JSON files or Ignition YAML. Cloud-Configs can be YAML or scripts. Both may contain may contain [Go template](https://golang.org/pkg/text/template/) elements which will be evaluated with [metadata](#groups-and-metadata). For details and examples:
-
-* [Ignition Config](ignition.md)
-* [Cloud-Config](cloud-config.md)
-
-#### Spec
-
-Specs specify the Ignition config, cloud-config, and PXE boot settings (kernel, options, initrd) of a matched machine.
-
-    {
-        "id": "etcd_profile",
-        "cloud_id": "",
-        "ignition_id": "etcd.yaml",
-        "boot": {
-            "kernel": "/assets/coreos/899.6.0/coreos_production_pxe.vmlinuz",
-            "initrd": ["/assets/coreos/899.6.0/coreos_production_pxe_image.cpio.gz"],
-            "cmdline": {
-                "cloud-config-url": "http://bootcfg.foo/cloud?uuid=${uuid}&mac=${net0/mac:hexhyp}",
-                "coreos.autologin": "",
-                "coreos.config.url": "http://bootcfg.foo/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}",
-                "coreos.first_boot": "1"
-            }
-        }
-    }
-
-The `"boot"` settings will be used to render configs to the network boot programs used in PXE, iPXE, or Pixiecore setups. You may reference remote kernel and initrd assets or [local assets](#assets).
-
-To use cloud-config, set the `cloud-config-url` kernel option to the `bootcfg` [Cloud-Config endpoint](api.md#cloud-config) `/cloud?param=val`, which will render the `cloud_id` file.
-
-To use Ignition, set the `coreos.config.url` kernel option to the `bootcfg` [Ignition endpoint](api.md#ignition-config) `/ignition?param=val`, which will render the `ignition_id` file. Be sure to add the `coreos.first_boot` option as well.
-
-## Groups and Metadata
-
-Groups define a set of required tags which match zero or more machines. Machines matching a group will boot and provision themselves according to the group's `spec` and metadata. Currently, `bootcfg` loads group definitions from a YAML config file specified by the `-config` flag. When running `bootcfg` as a container, it is easiest to keep the config file in the [data](#data) directory so it is mounted and versioned.
-
-Define a list of named groups, name the `Spec` that should be applied, add the tags required to match the group, and add your own `metadata` needed to render your Ignition or Cloud configs.
-
-Here is an example `bootcfg` config.yaml:
-
-    ---
-    api_version: v1alpha1
-    groups:
-      - name: default
-        spec: discovery
-      - name: Worker Node
-        spec: worker
-        require:
-          region: us-central1-a
-          zone: a
-      - name: etcd Node 1
-        spec: etcd
-        require:
-          uuid: 16e7d8a7-bfa9-428b-9117-363341bb330b
-        metadata:
-          networkd_name: ens3
-          networkd_gateway: 172.15.0.1
-          networkd_dns: 172.15.0.3
-          networkd_address: 172.15.0.21/16
-          ipv4_address: 172.15.0.21
-          etcd_name: node1
-          etcd_initial_cluster: "node1=http://172.15.0.21:2380"
-          ssh_authorized_keys:
-            - "ssh-rsa pub-key-goes-here"
-      - name: etcd Proxy
-        spec: etcd_proxy
-        require:
-          mac: 52:54:00:89:d8:10
-        metadata:
-          etcd_initial_cluster: "node1=http://172.15.0.21:2380"
-
-Requirements are AND'd together and evaluated from most constraints to least, in a deterministic order. For most endpoints, "tags" correspond to query arguments in machine requests. Machines are free to query `bootcfg` with additional information (query arguments) about themselves, but they must supply the required set of tags to match a group.
-
-For example, a request to `/cloud?mac=52:54:00:89:d8:10` would render the cloud-config named in "etcd_proxy" `Spec` with the etcd proxy metadata. A request to `/cloud` would match the default group (which has no requirements) and serve the cloud-config from the "discovery" `Spec`. Avoid defining multiple default groups as resolution will not be deterministic.
-
-### Reserved Attributes
-
-The following attributes/tags have reserved semantic purpose. Do not use these tags for other purposes as they may be normalized or parsed specially.
-
-* `uuid` - machine UUID
-* `mac` - network interface physical address (MAC address)
-* `hostname`
-* `serial`
-
-Client's booted with the `/ipxe.boot` endpoint will introspect and make a request to `/ipxe` with the `uuid`, `mac`, `hostname`, and `serial` value as query arguments. Pixiecore which can only detect MAC addresss and cannot substitute it into later config requests ([issue](https://github.com/coreos/coreos-baremetal/issues/36)).
-
-## Assets
-
-`bootcfg` can serve static assets from the `-assets-path` at `/assets`. This is helpful for reducing bandwidth usage when serving the kernel and initrd to network booted machines.
-
-Run the `get-coreos` script to quickly download kernel and initrd image assets.
-
-    ./scripts/get-coreos                 # beta, 899.6.0
-    ./scripts/get-coreos alpha 942.0.0
-
-This will create:
-
-    assets/
-    └── coreos
-        └── 899.6.0
-            ├── coreos_production_pxe.vmlinuz
-            └── coreos_production_pxe_image.cpio.gz
-
-To reference local assets, change `kernel` and `initrd` in a `Spec` from `http://stable.release.core-os.net/amd64-usr/current/coreos_production_pxe.vmlinuz` to `/assets/coreos/899.6.0/coreos_production_pxe.vmlinuz`, for example.
-
-## Endpoints
-
-The [API](api.md) documents the available endpoints.
-
-## Network
-
-`bootcfg` does not implement a DHCP/TFTP server or monitor running instances. If you need a quick DHCP, proxyDHCP, TFTP, or DNS setup, the [coreos/dnsmasq](../contrib/dnsmasq) image can create a suitable network boot environment on a virtual or physical network. Use `--net` to specify a network bridge and `--dhcp-boot` to point clients to `bootcfg`.
-
-## Virtual and Physical Machine Guides
-
-Next, setup a network of virtual machines with libvirt or boot a cluster of physical hardware. Follow the [libvirt guide](virtual-hardware.md) or [physical hardware guide](physical-hardware.md).

Documentation/cloud-config.md

@@ -1,67 +0,0 @@
-
-# Cloud Config
-
-CoreOS cloud-config is a system for configuring machines with a cloud-config file or executable script from user-data. Cloud-Config runs in userspace on each boot and implements a subset of the [cloud-init spec](http://cloudinit.readthedocs.org/en/latest/topics/format.html#cloud-config-data). See the cloud-config [docs](https://coreos.com/os/docs/latest/cloud-config.html) for details.
-
-Cloud-Config files and scripts can be added in a `cloud` subdirectory of the `bootcfg` data directory. The files may contain [Go template](https://golang.org/pkg/text/template/) elements which will be rendered with `metadata` when served.
-
-    data/
-    ├── cloud
-    │   ├── cloud.yaml
-    │   ├── kubernetes-master.sh
-    │   └── kubernetes-worker.sh
-    ├── ignition
-    └── specs
-
-Add a cloud-config to a `Spec` by adding the `cloud_id` field. When PXE booting, use the kernel option `cloud-config-url` to point to `bootcfg` cloud config endpoint.
-
-spec.json:
-
-    {
-        "id": "worker_profile",
-        "cloud_id": "worker.yaml",
-        "ignition_id": "",
-        "boot": {
-            "kernel": "/assets/coreos/899.6.0/coreos_production_pxe.vmlinuz",
-            "initrd": ["/assets/coreos/899.6.0/coreos_production_pxe_image.cpio.gz"],
-            "cmdline": {
-                "cloud-config-url": "http://bootcfg.foo/cloud?uuid=${uuid}&mac=${net0/mac:hexhyp}"
-            }
-        }
-    }
-
-## Configs
-
-Here is an example cloud-config which starts some units and writes a file.
-
-    #cloud-config
-    coreos:
-      units:
-        - name: etcd2.service
-          command: start
-        - name: fleet.service
-          command: start
-    write_files:
-      - path: "/home/core/welcome"
-        owner: "core"
-        permissions: "0644"
-        content: |
-          {{.greeting}}
-
-### Examples
-
-See [examples/cloud](../examples/cloud) for example cloud-config files.
-
-### Validator
-
-The cloud-config [validator](https://coreos.com/validate/) is useful for checking your cloud-config files for errors.
-
-## Endpoint
-
-The `bootcfg` [cloud-config endpoint](api.md#cloud-config) `/cloud?param=val` endpoint matches parameters to a machine `Spec` and renders the corresponding cloud-config with `metadata`.
-
-## Comparison with Ignition
-
-Cloud-Config starts after userspace has started and runs on every boot. Ignition starts earlier and only runs on the first boot to provision disk state. Often, tasks do not need to be repeated on each boot (e.g. writing systemd unit files) and can be performed more easily before systemd starts (e.g. configuring networking). Ignition is recommended unless a task requires re-execution on each boot.
-
-If a service needs to be started with dynamic data, a good approach is to use Ignition to write static files which leverage systemd's environment file expansion and start a metadata service to fetch runtime data for services which require it.

Documentation/config.md

@@ -1,31 +0,0 @@
-
-# Flags and Variables
-
-Configuration arguments can be provided as flags or as environment variables.
-
-| flag | variable | example |
-|------|----------|---------|
-| -address | BOOTCFG_ADDRESS | 0.0.0.0:8080 |
-| -config | BOOTCFG_CONFIG | ./data/config.yaml |
-| -data-path | BOOTCFG_DATA_PATH | ./data |
-| -assets-path | BOOTCFG_ASSETS_PATH | ./assets |
-| -key-ring-path | BOOTCFG_KEY_RING_PATH | ~/.secrets/vault/bootcfg/secring.gpg |
-| Disallowed | BOOTCFG_PASSPHRASE | secret passphrase |
-| -log-level | BOOTCFG_LOG_LEVEL | critical, error, warning, notice, info, debug |
-
-## Examples
-
-Build the static binary.
-
-    ./build
-
-Run
-
-    ./bin/bootcfg -address=0.0.0.0:8080 -log-level=debug -data-path examples/ -config examples/etcd-rkt.yaml
-
-Run with a fake signing key.
-
-    export BOOTCFG_PASSPHRASE=test
-    ./bin/bootcfg -address=0.0.0.0:8080 -key-ring-path sign/fixtures/secring.gpg -data-path examples/ -config examples/etcd-rkt.yaml
-
-

Documentation/getting-started-docker.md

@@ -1,72 +0,0 @@
-
-
-# Getting Started with Docker
-
-Get started with `bootcfg` on your Linux machine with Docker. If you're ready to try [rkt](https://coreos.com/rkt/docs/latest/), see [Getting Started with rkt](getting-started-rkt.md).
-
-In this tutorial, we'll run `bootcfg` to boot and provision a cluster of four VM machines on the `docker0` bridge. You'll be able to boot etcd clusters, Kubernetes clusters, and more, while testing different network setups.
-
-## Requirements
-
-Install the dependencies.
-
-    sudo dnf install virt-install docker virt-manager
-    sudo systemctl start docker
-
-Clone the [coreos-baremetal](https://github.com/coreos/coreos-baremetal) source which contains the examples and scripts.
-
-    git clone https://github.com/coreos/coreos-baremetal.git
-    cd coreos-baremetal
-
-Create four VM nodes which have known hardware attributes. The nodes will be attached to the `docker0` bridge where your containers run.
-
-    sudo ./scripts/libvirt create-docker
-
-Download the CoreOS PXE image assets to `assets/coreos`. The examples instruct machines to load these from the Config server, though you could change this.
-
-    ./scripts/get-coreos
-
-## Containers
-
-Run `bootcfg` on the default bridge `docker0`. The bridge should assign it the IP 172.17.0.2 (`sudo docker network inspect bridge`).
-
-    sudo docker run -p 8080:8080 --rm -v $PWD/examples:/data:Z -v $PWD/assets:/assets:Z quay.io/coreos/bootcfg:latest -address=0.0.0.0:8080 -log-level=debug -config /data/etcd-docker.yaml
-
-Take a look at [etcd-docker.yaml](../examples/etcd-docker.yaml) to get an idea of how machines are matched to specifications. Explore some endpoints port mapped to localhost:8080.
-
-* [node1's ipxe](http://127.0.0.1:8080/ipxe?uuid=16e7d8a7-bfa9-428b-9117-363341bb330b)
-* [node1's Ignition](http://127.0.0.1:8080/ignition?uuid=16e7d8a7-bfa9-428b-9117-363341bb330b)
-* [node1's Metadata](http://127.0.0.1:8080/metadata?uuid=16e7d8a7-bfa9-428b-9117-363341bb330b)
-
-Since the virtual network has no network boot services, use the `dnsmasq` container to set up an example iPXE environment which runs DHCP, DNS, and TFTP. The `dnsmasq` container can help test different network setups.
-
-    sudo docker run --rm --cap-add=NET_ADMIN quay.io/coreos/dnsmasq -d -q --dhcp-range=172.17.0.43,172.17.0.99 --enable-tftp --tftp-root=/var/lib/tftpboot --dhcp-userclass=set:ipxe,iPXE --dhcp-boot=tag:#ipxe,undionly.kpxe --dhcp-boot=tag:ipxe,http://bootcfg.foo:8080/boot.ipxe --log-queries --log-dhcp --dhcp-option=3,172.17.0.1 --address=/bootcfg.foo/172.17.0.2
-
-In this case, it runs a DHCP server allocating IPs to VMs between 172.17.0.43 and 172.17.0.99, resolves bootcfg.foo to 172.17.0.2 (the IP where `bootcfg` runs), and points iPXE clients to `http://bootcfg.foo:8080/boot.ipxe`.
-
-## Verify
-
-Reboot the VM machines and use `virt-manager` to watch the console.
-
-    sudo ./scripts/libvirt poweroff
-    sudo ./scripts/libvirt start
-
-At this point, the VMs will PXE boot and use Ignition (preferred over cloud config) to set up a three node etcd cluster, with other nodes behaving as etcd proxies.
-
-On VMs with autologin, check etcd2 works between different nodes.
-
-    systemctl status etcd2
-    etcdctl set /message hello
-    etcdctl get /message
-
-Clean up the VM machines.
-
-    sudo ./scripts/libvirt poweroff
-    sudo ./scripts/libvirt destroy
-    sudo ./scripts/libvirt delete-disks
-
-## Going Further
-
-Explore the [examples](../examples). Try the `k8s-docker.yaml` [example](../examples/README.md#kubernetes) to produce a TLS-authenticated Kubernetes cluster you can access locally with `kubectl`.
-
-Learn more about [bootcfg](bootcfg.md), enable [OpenPGP signing](openpgp.md), or adapt an example for your own [physical hardware](physical-hardware.md) and network.

Documentation/getting-started-rkt.md

@@ -1,112 +0,0 @@
-# Getting Started with rkt
-
-Get started with `bootcfg` on your Linux machine with rkt, CNI, and appc. 
-
-In this tutorial, we'll run `bootcfg` to boot and provision a cluster of four VM machines on a CNI bridge (`metal0`). You'll be able to boot etcd clusters, Kubernetes clusters, and more, while testing different network setups.
-
-## Requirements
-
-**Note**: Currently, rkt and the Fedora/RHEL/CentOS SELinux policies aren't supported. See the [issue](https://github.com/coreos/rkt/issues/1727) tracking the work and policy changes. To test these examples on your laptop, set SELinux enforcement to permissive if you are comfortable (`sudo setenforce 0`). Enable it again when you are finished.
-
-Install [rkt](https://github.com/coreos/rkt/releases), [acbuild](https://github.com/appc/acbuild), and package dependencies.
-
-    sudo dnf install virt-install virt-manager
-
-Clone the [coreos-baremetal](https://github.com/coreos/coreos-baremetal) source which contains the examples and scripts.
-
-    git clone https://github.com/coreos/coreos-baremetal.git
-    cd coreos-baremetal
-
-Download the CoreOS PXE image assets to `assets/coreos`. The examples instruct machines to load these from the Config server, though you could change this.
-
-    ./scripts/get-coreos
-
-Define the `metal0` virtual bridge with [CNI](https://github.com/appc/cni).
-
-```bash
-sudo bash -c 'cat > /etc/rkt/net.d/20-metal.conf << EOF
-{
-  "name": "metal0",
-  "type": "bridge",
-  "bridge": "metal0",
-  "isGateway": true,
-  "ipMasq": true,
-  "ipam": {
-    "type": "host-local",
-    "subnet": "172.15.0.0/16",
-    "routes" : [ { "dst" : "172.15.0.0/16" } ]
-   }
-}
-EOF'
-```
-
-## Application Container
-
-Run `bootcfg` on the `metal0` network, with a known IP we'll use in later steps with DNS.
-
-    sudo rkt trust --prefix quay.io/coreos
-    sudo rkt --insecure-options=image fetch docker://quay.io/coreos/bootcfg
-
-Currently, the insecure flag is needed since Docker images do not support signature verification. We'll ship an ACI soon to address this.
-
-    sudo rkt run --net=metal0:IP=172.15.0.2 --mount volume=assets,target=/assets --volume assets,kind=host,source=$PWD/assets --mount volume=data,target=/data --volume data,kind=host,source=$PWD/examples quay.io/coreos/bootcfg -- -address=0.0.0.0:8080 -log-level=debug -config /data/etcd-rkt.yaml
-
-If you get an error about the IP assignment, garbage collect old pods.
-
-    sudo rkt gc --grace-period=0
-
-Take a look at [etcd-rkt.yaml](../examples/etcd-rkt.yaml) to get an idea of how machines are matched to specifications. Explore some endpoints exposed by the service.
-
-* [node1's ipxe](http://172.15.0.2:8080/ipxe?uuid=16e7d8a7-bfa9-428b-9117-363341bb330b)
-* [node1's Ignition](http://172.15.0.2:8080/ignition?uuid=16e7d8a7-bfa9-428b-9117-363341bb330b)
-* [node1's Metadata](http://172.15.0.2:8080/metadata?uuid=16e7d8a7-bfa9-428b-9117-363341bb330b)
-
-## Client VMs
-
-Create four VM nodes which have known hardware attributes. The nodes will be attached to the `metal0` bridge where your pods run.
-
-    sudo ./scripts/libvirt create-rkt
-
-## Network
-
-In your **Firewall Configuration**, add the `metal0` interface to the trusted zone.
-
-Since the virtual network has no network boot services, use the `dnsmasq` ACI to set up an example iPXE environment which runs DHCP, DNS, and TFTP. The `dnsmasq` container can help test different network setups.
-
-Build the `dnsmasq.aci` ACI.
-
-    cd contrib/dnsmasq
-    sudo ./build-aci
-
-Run `dnsmasq.aci` to create a DHCP and TFTP server pointing to config server.
-
-    sudo rkt --insecure-options=image run dnsmasq.aci --net=metal0:IP=172.15.0.3 -- -d -q --dhcp-range=172.15.0.50,172.15.0.99 --enable-tftp --tftp-root=/var/lib/tftpboot --dhcp-userclass=set:ipxe,iPXE --dhcp-boot=tag:#ipxe,undionly.kpxe --dhcp-boot=tag:ipxe,http://bootcfg.foo:8080/boot.ipxe --log-queries --log-dhcp --dhcp-option=3,172.15.0.1 --address=/bootcfg.foo/172.15.0.2
-
-In this case, dnsmasq runs a DHCP server allocating IPs to VMs between 172.15.0.50 and 172.15.0.99, resolves bootcfg.foo to 172.15.0.2 (the IP where `bootcfg` runs), and points iPXE clients to `http://bootcfg.foo:8080/boot.ipxe`.
-
-## Verify
-
-Reboot the VM machines and use `virt-manager` to watch the console.
-
-    sudo ./scripts/libvirt poweroff
-    sudo ./scripts/libvirt start
-
-At this point, the VMs will PXE boot and use Ignition (preferred over cloud config) to set up a three node etcd cluster, with other nodes behaving as etcd proxies.
-
-On VMs with autologin, check etcd2 works between different nodes.
-
-    systemctl status etcd2
-    etcdctl set /message hello
-    etcdctl get /message
-
-Press ^] three times to stop a rkt pod. Clean up the VM machines.
-
-    sudo ./scripts/libvirt poweroff
-    sudo ./scripts/libvirt destroy
-    sudo ./scripts/libvirt delete-disks
-
-## Going Further
-
-Explore the [examples](../examples). Try the `k8s-rkt.yaml` [example](../examples/README.md#kubernetes) to produce a TLS-authenticated Kubernetes cluster you can access locally with `kubectl`.
-
-Learn more about [bootcfg](bootcfg.md), enable [OpenPGP signing](openpgp.md), or adapt an example for your own [physical hardware](physical-hardware.md) and network.

Documentation/ignition.md

@@ -1,106 +0,0 @@
-
-# Ignition
-
-Ignition is a system for declaratively provisioning disks during the initramfs, before systemd starts. It runs only on the first boot and handles formatting partitions, writing files (systemd units, networkd units, dropins, regular files), and configuring users. See the Ignition [docs](https://coreos.com/ignition/docs/latest/) for details.
-
-Ignition template files can be added in an `ignition` subdirectory of the `bootcfg` data directory. The files may contain [Go template](https://golang.org/pkg/text/template/) elements which should evaluate, with `metadata`, to Ignition JSON or to Ignition YAML (which will be rendered as JSON).
-
-    data
-     ├── cloud
-     ├── ignition
-     │   └── simple.json
-     │   └── etcd.yaml
-     │   └── etcd_proxy.yaml
-     │   └── networking.yaml
-     └── specs
-
-Add an Ignition config to a `Spec` by adding the `ignition_id` field. When PXE booting, use the kernel option `coreos.first_boot=1` and `coreos.config.url` to point to the `bootcfg`ignition endpoint.
-
-spec.json:
-
-     {
-         "id": "etcd_profile",
-         "boot": {
-             "kernel": "/assets/coreos/899.6.0/coreos_production_pxe.vmlinuz",
-             "initrd": ["/assets/coreos/899.6.0/coreos_production_pxe_image.cpio.gz"],
-             "cmdline": {
-                 "coreos.config.url": "http://bootcfg.foo/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}",
-                 "coreos.first_boot": "1"
-             }
-         },
-         "cloud_id": "",
-         "ignition_id": "etcd.yaml"
-     }
-
-## Configs
-
-Here is an example Ignition config for static networking, which will be evaluated with metadata into YAML and tranformed into machine-friendly JSON.
-
-ignition/network.yaml:
-
-    ---
-    ignition_version: 1
-    networkd:
-      units:
-        - name: 00-{{.networkd_name}}.network
-          contents: |
-            [Match]
-            Name={{.networkd_name}}
-            [Network]
-            Gateway={{.networkd_gateway}}
-            DNS={{.networkd_dns}}
-            DNS=8.8.8.8
-            Address={{.networkd_address}}
-    {{ if .ssh_authorized_keys }}
-    passwd:
-      users:
-        - name: core
-          ssh_authorized_keys:
-            {{ range $element := .ssh_authorized_keys }}
-            - {{$element}}
-            {{end}}
-    {{end}}
-
-Response from `/ignition?mac=address` for a particular machine.
-
-    {
-      "ignitionVersion": 1,
-      "storage": {},
-      "systemd": {},
-      "networkd": {
-        "units": [
-          {
-            "name": "00-ens3.network",
-            "contents": "[Match]\nName=ens3\n[Network]\nGateway=172.15.0.1\nDNS=172.15.0.3\nDNS=8.8.8.8\nAddress=172.15.0.21/16\n"
-          }
-        ]
-      },
-      "passwd": {}
-    }
-
-Note that Ignition does **not** allow variables - the response has been fully rendered with `metadata` for the requesting machine.
-
-Ignition configs can be provided directly as JSON as well. This is useful for simple cases or if you prefer to use your own templating solution to generate Ignition configs.
-
-ignition/run-hello.json:
-
-    {
-        "ignitionVersion": 1,
-        "systemd": {
-            "units": [
-                {
-                    "name": "hello.service",
-                    "enable": true,
-                    "contents": "[Service]\nType=oneshot\nExecStart=/usr/bin/echo Hello World\n\n[Install]\nWantedBy=multi-user.target"
-                }
-            ]
-        }
-    }
-
-### Examples
-
-See [examples/ignition](../examples/ignition) for example Ignition configs which setup networking, install CoreOS to disk, or start etcd.
-
-## Endpoint
-
-The `bootcfg` [Ignition endpoint](api.md#ignition-config) `/ignition?param=val` endpoint matches parameters to a machine `Spec` and renders the corresponding Ignition config with `metadata`, transforming YAML to JSON if needed.

Documentation/network-booting.md

@@ -1,97 +0,0 @@
-
-# Network Boot Environments
-
-These guides walk through booting and configuring CoreOS on real or virtual hardware on your network. This introductory document reviews network booting protocols and the requirments of your network environment.
-
-Once you've reviewed the protocols, you'll be ready to [get started](getting-started-rkt.md) serving configs to machines during boot with [bootcfg](bootcfg.md).
-
-## PXE
-
-The Preboot eXecution Environment (PXE) defines requirements for consistent, hardware-independent network-based machine booting and configuration. Formally, PXE specifies pre-boot protocol services that client NIC firmware must provide (DHCP, TFTP, UDP/IP), specifies boot firmware requirements, and defines a client-server protocol for obtaining a network boot program (NBP) which automates OS installation and configuration.
-
-<img src='img/pxelinux.png' class="img-center" alt="Basic PXE client server protocol flow"/>
-
-At power-on, if a client machine's BIOS or UEFI boot firmware is set to perform network booting, the network interface card's PXE firmware broadcasts a DHCPDISCOVER packet identifying itself as a PXEClient to the network environment.
-
-The network environment can be set up in a number of ways, which we'll discuss. In the simplest, a PXE-enabled DHCP Server responds with a DHCPOFFER with Options, which include a TFTP server IP ("next server") and the name of an NBP ("boot filename") to download (e.g. pxelinux.0). PXE firmware then downloads the NBP over TFTP and starts it. Finally, the NBP loads configs, scripts, and/or images it requires to run an OS.
-
-### Network Boot Programs
-
-Machines can be booted and configured with CoreOS using several network boot programs and approaches. Let's review them. If you're new to network booting or unsure which to choose, iPXE is a reasonable and flexible choice.
-
-#### PXELINUX
-
-[PXELINUX](http://www.syslinux.org/wiki/index.php/PXELINUX) is a common network boot program which loads a config file from `mybootdir/pxelinux.cfg/`  over TFTP. The file is chosen based on the client's UUID, MAC address, IP address, or a default.
-
-    mybootdir/pxelinux.cfg/b8945908-d6a6-41a9-611d-74a6ab80b83d
-    mybootdir/pxelinux.cfg/default
-
-Here is an example PXE config file which boots a CoreOS image hosted on the TFTP server.
-
-```
-default coreos
-prompt 1
-timeout 15
-
-display boot.msg
-
-label coreos
-  menu default
-  kernel coreos_production_pxe.vmlinuz
-  append initrd=coreos_production_pxe_image.cpio.gz cloud-config-url=http://example.com/pxe-cloud-config.yml
-```
-
-PXELINUX then downloads the specified kernel and init RAM filesystem images with TFTP.
-
-This approach has a number of drawbacks. TFTP can be slow, managing config files can be tedious, and using different ignition or cloud configs on different machines requires separate pxelinux configs. These limitations spurred the development of various enhancements to PXE, discussed next.
-
-In these guides, PXE is used to load the iPXE boot file so iPXE can chainload config scripts and HTTP images over HTTP. Continue to the [libvirt guide](virtual-hardware.md) or the [baremetal guide](physical-hardware.md) to boot PXE clients by chainloading iPXE. Consult [CoreOS with PXE](https://coreos.com/os/docs/latest/booting-with-pxe.html) for details about CoreOS support for PXE.
-
-#### iPXE
-
-[iPXE](http://ipxe.org/) is an enhanced implementation of the PXE client firmware and a network boot program which uses iPXE scripts rather than config files and can download scripts and images with HTTP.
-
-<img src='img/ipxe.png' class="img-center" alt="iPXE client server protocol flow"/>
-
-A DHCPOFFER to iPXE client firmware specifies an HTTP boot script such as `http://bootcfg.foo/boot.ipxe`.
-
-Here is an example iPXE script for booting the remote CoreOS stable image.
-
-```
-#!ipxe
-
-set base-url http://stable.release.core-os.net/amd64-usr/current
-kernel ${base-url}/coreos_production_pxe.vmlinuz cloud-config-url=http://provisioner.example.net/cloud-config.yml
-initrd ${base-url}/coreos_production_pxe_image.cpio.gz
-boot
-```
-
-A TFTP server is used only to provide the `undionly.kpxe` boot program to older PXE firmware in order to bootstrap into iPXE.
-
-CoreOS `bootcfg` can render signed iPXE scripts to machines based on their hardware attributes. Setup involves configuring your DHCP server to point iPXE clients to the `bootcfg` [iPXE endpoint](api.md#ipxe).
-
-Continue to the [libvirt guide](virtual-hardware.md) or the [baremetal guide](physical-hardware.md) to use iPXE to boot PXE/iPXE client machines. Consult [CoreOS with iPXE](https://coreos.com/os/docs/latest/booting-with-ipxe.html) for details about CoreOS support for iPXE.
-
-#### Pixiecore
-
-[Pixiecore](https://github.com/danderson/pixiecore) is a newer service which implements a proxyDHCP server, TFTP server, and HTTP server all-in-one and calls through to an HTTP API. CoreOS `bootcfg` can serve Pixiecore JSON (optionally signed) based on the supplied MAC address, to implement the Pixiecore HTTP API.
-
-Continue to the [libvirt guide](virtual-hardware.md) to use Pixiecore to network boot PXE client machines.
-
-## Network Environments
-
-### DHCP
-
-Many networks have DHCP services which are impractical to modify or disable. Corporate DHCP servers are governed by network admin policies and home/office networks often have routers running a DHCP service which cannot supply PXE options to PXE clients.
-
-To address this, PXE client firmware listens for DHCPOFFERs from a non-PXE DHCP server *and* a PXE-enabled **proxyDHCP server** configured to respond with the next server and boot filename only. Client firmware combines the two responses as if they had come from a single PXE-enabled DHCP server.
-
-<img src='img/proxydhcp.png' class="img-center" alt="DHCP and proxyDHCP responses are merged to get PXE Options"/>
-
-The [libvirt guide](virtual-hardware.md) shows how to setup a network environment with a standalone PXE-enabled DHCP server or with a separate DHCP server and proxyDHCP server.
-
-The [baremetal guide](physical-hardware.md) shows how to check your network environment and run either a standalone PXE-enabled DHCP server, a proxyDHCP server to compliment your existing network DHCP service, or configure existing services. 
-
-## Configuration Service
-
-Now that you understand network booting protocols [get started](getting-started-rkt.md) serving configs to machines during boot with [bootcfg](bootcfg.md).

Documentation/openpgp.md

@@ -1,65 +0,0 @@
-
-# OpenPGP Signing
-
-The `bootcfg` OpenPGP signature endpoints serve ASCII armored detached signatures of rendered configs, if enabled. Each config endpoint has a corresponding signature endpoint, usually suffixed by `.asc`.
-
-To enable OpenPGP signing, provide the path to a secret keyring containing a single signing key with `-key-ring-path` or by setting `BOOTCFG_KEY_RING_PATH`. If a passphrase is required, set it via the `BOOTCFG_PASSPHRASE` environment variable.
-
-Here are example signature endpoints without their query parameters.
-
-| Endpoint   | ASCII Signature Endpoint |
-|------------|-----------------|
-| Ignition   | `http://bootcfg.foo/ignition.asc` |
-| Cloud-init | `http://bootcfg.foo/cloud.asc` |
-| iPXE       | `http://bootcfg.foo/boot.ipxe.asc` |
-| iPXE       | `http://bootcfg.foo/ipxe.asc` |
-| Pixiecore  | `http://bootcfg.foo/pixiecore/v1/boot.asc/:MAC` |
-
-In production, mount your signing keyring and source the passphrase from a [Kubernetes secret](http://kubernetes.io/v1.1/docs/user-guide/secrets.html). Use a signing subkey exported to a keyring used only for config signing, which can be revoked by a master if needed.
-
-To try it locally, you may use the test fixture keyring. **Warning: The test fixture keyring is for examples only.**
-
-**Binary**
-
-    export BOOTCFG_PASSPHRASE=test
-    ./bin/bootcfg -address=0.0.0.0:8080 -key-ring-path sign/fixtures/secring.gpg -config examples/etcd-rkt.yaml -data-path examples/
-
-**rkt**
-
-    sudo rkt run --set-env=BOOTCFG_PASSPHRASE=test --mount volume=secrets,target=/secrets --volume secrets,kind=host,source=$PWD/sign/fixtures --mount volume=assets,target=/assets --volume assets,kind=host,source=$PWD/assets --mount volume=data,target=/data --volume data,kind=host,source=$PWD/examples quay.io/coreos/bootcfg -- -address=0.0.0.0:8080 -config /data/etcd-rkt.yaml -key-ring-path secrets/secring.gpg
-
-**docker**
-
-    sudo docker run -p 8080:8080 --rm --env BOOTCFG_PASSPHRASE=test -v $PWD/examples:/data:Z -v $PWD/assets:/assets:Z -v $PWD/sign/fixtures:/secrets:Z quay.io/coreos/bootcfg:latest -address=0.0.0.0:8080 -config=/data/etcd-docker.yaml -key-ring-path secrets/secring.gpg
-
-## Verify
-
-Verify a signature response and config response from the command line using the public key. Notice that most configs have a trailing newline.
-
-**Warning: The test fixture keyring is for examples only.**
-
-    $ gpg --homedir sign/fixtures --verify sig_file response_file
-    gpg: Signature made Mon 08 Feb 2016 11:37:03 PM PST using RSA key ID 9896356A
-    gpg: sign/fixtures/trustdb.gpg: trustdb created
-    gpg: Good signature from "Fake Bare Metal Key (Do not use) <do-not-use@example.com>"
-    gpg: WARNING: This key is not certified with a trusted signature!
-    gpg:          There is no indication that the signature belongs to the owner.
-    Primary key fingerprint: BE2F 12BC 3642 2594 570A  CCBB 8DC4 2020 9896 356A
-
-## Signing Key Generation
-
-Create a signing key or subkey according to your requirements and security policies. Here are some basic [guides](https://coreos.com/rkt/docs/latest/signing-and-verification-guide.html).
-
-### gpg
-
-    mkdir -m 700 path/in/vault
-    gpg --homedir path/in/vault --expert --gen-key
-    ...
-
-### gpg2
-
-    mkdir -m 700 path/in/vault
-    gpg2 --homedir path/in/vault --expert --gen-key
-    ...
-    gpg2 --homedir path/in/vault --export-secret-key KEYID > path/in/vault/secring.gpg
-

Documentation/physical-hardware.md

@@ -1,103 +0,0 @@
-
-# CoreOS on Baremetal/Physical Hardware
-
-Physical or baremetal hardware can be booted and configured with CoreOS by PXE, iPXE, and Pixiecore network environments. This guide will show how to setup and test network boot environments with physical clients.
-
-DHCP, TFTP, and HTTP services can run on separate network hosts or on the same host in PXE network environments. We'll focus on configuring a single *provisioner* Linux host to run these services as containers.
-
-## Requirements
-
-Client hardware boot firmware must support PXE or iPXE and the client must have at least one PXE-capable network interface. Most boot firmware and network cards support PXE so you're probably ok.
-
-## Inspect
-
-Identify whether the network runs a DHCP service which can be configured or whether you'll need to run a proxyDHCP service. Check a host's routing table to find the gateway where DHCP is likely to be running.
-
-    route -n        # e.g. Gateway 192.168.1.1
-
-## bootcfg
-
-Set up `bootcfg` according to the [docs](bootcfg.md). Pull the `coreos/bootcfg` image, prepare a data volume with `Machine` definitions, `Spec` definitions and ignition/cloud configs. Optionally, include a volume of downloaded image assets.
-
-Run the `bootcfg` container to serve configs for any of the network environments we'll discuss next.
-
-    docker run -p 8080:8080 --net=host --name=bootcfg --rm -v $PWD/examples:/data:Z -v $PWD/assets:/assets:Z coreos/bootcfg:latest -address=0.0.0.0:8080 -log-level=debug -config /data/etcd-docker.yaml
-
-Note, the kernel options in the `Spec` [examples](../examples) reference 172.17.0.2 (the libvirt case). Your kernel cmdline options should reference the IP or DNS name where `bootcfg` runs.
-
-## Network Setups
-
-Your network may already have a configurable PXE or iPXE server, configurable DHCP, a DHCP server you cannot modify, or no DHCP server at all. We'll show how to setup each network environment to talk to `bootcfg`, depending on your circumstances.
-
-Otherwise create a PXE, iPXE, or Pixiecore network boot environment using the CoreOS [dnsmasq](../contrib/dnsmasq) container image which can run DHCP, proxyDHCP, TFTP, and/or DNS with `dnsmasq`. Use `--net=host` to run the services on the host and use `--dhcp-boot` to point clients to `bootcfg`.
-
-### Configurable iPXE
-
-If your network environment already supports iPXE, edit your iPXE boot script to chainload from `bootcfg`
-
-    # boot.ipxe
-    chain http://192.168.1.100:8080/boot.ipxe
-
-Substitute the name or IP and port where `bootcfg` runs.
-
-### Configurable DHCP
-
-If the DHCP server on your network is PXE-enabled and configurable, send the `bootcfg` iPXE endpoint as the boot filename option (e.g. `http://192.168.1.100:8080/boot.ipxe`). Substitute the name or IP and port where `bootcfg` runs.
-
-Optionally, respond to older PXE client firmware with the location of the `undionly.kpxe` boot program on your TFTP server.
-
-With `dnsmasq`, here is an example `dnsmasq.conf`
-
-    # dnsmasq.conf
-    dhcp-range=192.168.1.1,192.168.1.254,30m
-    enable-tftp
-    tftp-root=/var/lib/tftpboot
-    # set tag "ipxe" if request comes from iPXE ("iPXE" user class)
-    dhcp-userclass=set:ipxe,iPXE
-    # if PXE request came from regular firmware, serve iPXE firmware (via TFTP)
-    dhcp-boot=tag:!ipxe,undionly.kpxe
-    # if PXE request came from iPXE, serve an iPXE boot script (via HTTP)
-    dhcp-boot=tag:ipxe,http://192.168.1.100:8080/boot.ipxe
-
-### proxyDHCP
-
-If the network already runs a DHCP service, setup a PXE/iPXE network environment alongside it with proxyDHCP and TFTP.
-
-Run DHCP in proxy mode to respond to DHCP requests on the subnet. Optionally, serve the `undionly.pxe` boot file to older, non-iPXE clients (the '#' means not). Detect iPXE clients by the user class sent in their DHCPDISCOVER (or by Option 175) and point them to the `bootcfg` iPXE boot script.
-
-```
-sudo docker run --net=host --rm --cap-add=NET_ADMIN quay.io/coreos/dnsmasq -d -q -i enp0s25 --dhcp-range=192.168.1.1,proxy,255.255.255.0 --enable-tftp --tftp-root=/var/lib/tftpboot --dhcp-userclass=set:ipxe,iPXE --pxe-service=tag:#ipxe,x86PC,"PXE chainload to iPXE",undionly.kpxe --pxe-service=tag:ipxe,x86PC,"iPXE",http://192.168.1.100:8080/boot.ipxe
-```
-
-Change the `dhcp-range`, `-i interface`, and boot.ipxe endpoint to match your environment.
-
-In this example, an existing router at 192.168.1.1 runs DHCP to allocate IP addresses between 192.168.1.2 and 192.168.1.254. The proxyDHCP is configured to respond to disocver requests on the 192.168.1.0/24 subnet. `bootcfg` runs on host (192.168.1.100) to serve iPXE boot scripts.
-
-### DHCP
-
-If the network does not already run a DHCP service, you can run one yourself and provide PXE options to baremetal clients. This is the case if your baremetal machines are connected to an isolated switch.
-
-Identify a host machine which should run the DHCP service. If this machine has two NICs, it can serve as a router, using one for the uplink connection and the other to connect to the subnet with baremetal clients.
-
-Run DHCP to allocate IP address leases and TFTP to serve the `undionly.pxe` boot file to older, non-iPXE clients (the '#' means not). Point iPXE clients to the `bootcfg` iPXE boot script.
-
-```
-sudo docker run --net=host --rm --cap-add=NET_ADMIN quay.io/coreos/dnsmasq -d -q -i enp0s20u1 --dhcp-range=192.168.1.101,192.168.1.150 --enable-tftp --tftp-root=/var/lib/tftpboot --dhcp-userclass=set:ipxe,iPXE --dhcp-boot=tag:#ipxe,undionly.kpxe --dhcp-boot=tag:ipxe,http://192.168.1.100:8080/boot.ipxe
-```
-
-Change the `dhcp-range`, `-i interface`, and boot.ipxe endpoint to match your environment.
-
-In this example, a DHCP server is configured to allocate IP addresses between 192.168.1.101 and 192.168.1.150. `bootcfg` runs on host (192.168.1.100) to serve iPXE boot scripts.
-
-You may have to explicitly assign the interface (-i) a network address and mark the interface as up.
-
-    ip addr add 192.168.1.100/24 dev enp0s20u1
-    ip link set dev enp0s20u1 up 
-
-## Troubleshooting
-
-See [troubleshooting](troubleshooting.md).
-
-### Alternatives
-
-If you prefer, [Debian](http://www.debian-administration.org/article/478/Setting_up_a_server_for_PXE_network_booting), [Fedora](https://docs.fedoraproject.org/en-US/Fedora/7/html/Installation_Guide/ap-pxe-server.html), and [Ubuntu](https://help.ubuntu.com/community/DisklessUbuntuHowto) provide guides on PXE server setups. CoreOS-baremetal also includes [Vagrantfiles](vagrant) to quickly setup example Fedora PXE, iPXE, and Pixiecore servers on libvirt.

Documentation/troubleshooting.md

@@ -1,18 +0,0 @@
-
-# Troubleshooting
-
-## Firewall
-
-Running DHCP or proxyDHCP with `coreos/dnsmasq` on a host requires that the Firewall allow DHCP and TFTP (for chainloading) services to run.
-
-## Port Collision
-
-Running DHCP or proxyDHCP can cause port already in use collisions depending on what's running. Fedora runs bootp listening on udp/67 for example. Find the service using the port.
-
-    sudo lsof -i :67
-
-Evaluate whether you can configure the existing service or whether you'd like to stop it and test with `coreos/dnsmasq`.
-
-## No boot filename received
-
-PXE client firmware did not receive a DHCP Offer with PXE-Options after several attempts. If you're using the `coreos/dnsmasq` image with `-d`, each request should log to stdout. Using the wrong `-i` interface is the most common reason DHCP requests are not received. Otherwise, wireshark can be useful for investigating.

Documentation/virtual-hardware.md

@@ -1,122 +0,0 @@
-
-# CoreOS on Libvirt Virtual Hardware
-
-CoreOS can be booted and configured on virtual hardware within a libvirt environment (under Linux) with different network services running as Docker containers on the `docker0` virtual bridge. Client VMs or even baremetal hardware attached to the bridge can be booted and configured from the network.
-
-Docker containers run on the `docker0` virtual bridge, typically on a subnet 172.17.0.0/16. Docker assigns IPs to containers started through the docker cli, but the bridge does not run a DHCP service. List network bridges on your host and inspect the bridge Docker 1.9+ created (Docker cli refers to `docker0` as `bridge`).
-
-    brctl show
-    docker network inspect bridge
-
-## bootcfg
-
-Set up `bootcfg` according to the [docs](bootcfg.md). Pull the `coreos/bootcfg` image, prepare a data volume with `Spec` definitions and ignition/cloud configs. Optionally, include a volume of downloaded image assets.
-
-Run the `bootcfg` container to serve configs for any of the network environments we'll discuss next.
-
-    docker run -p 8080:8080 --name=bootcfg --rm -v $PWD/examples:/data:Z -v $PWD/assets:/assets:Z coreos/bootcfg:latest -address=0.0.0.0:8080 -log-level=debug -config /data/etcd-docker.yaml
-
-Note, the kernel options in the `Spec` [examples](../examples) reference 172.17.0.2, the first container IP Docker is likely to assign to `bootcfg`. Ensure your kernel options point to where `bootcfg` runs.
-
-    docker inspect bootcfg   # look for Networks, bridge, IPAddress
-
-## Network Setups
-
-Create a PXE, iPXE, or Pixiecore network boot environment using the CoreOS [dnsmasq](../contrib/dnsmasq) container image which can run DHCP, proxyDHCP, TFTP, and/or DNS with `dnsmasq`. Use `--net` to specify a virtual bridge and `--dhcp-boot` to point clients to `bootcfg`.
-
-### PXE
-
-To boot PXE clients, configure a PXE network environment to [chainload iPXE](http://ipxe.org/howto/chainloading). The iPXE setup below configures DHCP to send `undionly.kpxe` over TFTP to older PXE clients for this purpose.
-
-With `dnsmasq`, the relevant `dnsmasq.conf` settings would be:
-
-    enable-tftp
-    tftp-root=/var/lib/tftpboot
-    # if PXE request came from regular firmware, serve iPXE firmware (via TFTP)
-    dhcp-boot=tag:!ipxe,undionly.kpxe
-
-### iPXE
-
-Create a PXE/iPXE network environment by running a PXE-enabled DHCP server and TFTP server on the `docker0` bridge, alongside `bootcfg`.
-
-```
-sudo docker run --rm --cap-add=NET_ADMIN quay.io/coreos/dnsmasq -d -q --dhcp-range=172.17.0.43,172.17.0.99 --enable-tftp --tftp-root=/var/lib/tftpboot --dhcp-userclass=set:ipxe,iPXE --dhcp-boot=tag:#ipxe,undionly.kpxe --dhcp-boot=tag:ipxe,http://172.17.0.2:8080/boot.ipxe --log-dhcp --dhcp-option=3,172.17.0.1 --address=/bootcfg.foo/172.17.0.2
-```
-
-The `coreos/dnsmasq` image runs DHCP and TFTP as a container. It allocates IPs in the `docker0` subnet to VMs and sends options to chainload older PXE clients to iPXE. iPXE clients are pointed to the `bootcfg` service iPXE endpoint (assumed to be running on 172.17.0.2:8080).
-
-To run dnsmasq as a service, rather than from the commandline, the `dnsmasq.conf` might be:
-
-```
-# dnsmasq.conf
-dhcp-range=172.17.0.43,172.17.0.99,30m
-enable-tftp
-tftp-root=/var/lib/tftpboot
-# set tag "ipxe" if request comes from iPXE ("iPXE" user class)
-dhcp-userclass=set:ipxe,iPXE
-# if PXE request came from regular firmware, serve iPXE firmware (via TFTP)
-dhcp-boot=tag:!ipxe,undionly.kpxe
-# if PXE request came from iPXE, serve an iPXE boot script (via HTTP)
-dhcp-boot=tag:ipxe,http://172.17.0.2:8080/boot.ipxe
-```
-
-<img src='img/libvirt-ipxe.png' class="img-center" alt="Libvirt iPXE network environment"/>
-
-Continue to [clients](#clients) to create a client VM or attach a baremetal machine to boot.
-
-### Pixiecore
-
-Create a Pixiecore network environment by running a DHCP server and `danderson/pixiecore` on the `docker0` bridge, alongside `bootcfg`. Pixiecore is a combined proxyDHCP/TFTP/HTTP server.
-
-Run a DHCP server (not PXE-enabled)
-
-```
-sudo docker run --rm --cap-add=NET_ADMIN quay.io/coreos/dnsmasq -d -q --dhcp-range=172.17.0.43,172.17.0.99
-```
-
-Run Pixiecore, using a script which detects the `bootcfg` container IP:port on docker0.
-
-    ./scripts/pixiecore
-
-Continue to [clients](#clients) to create a client VM or attach a baremetal machine to boot.
-
-## Clients
-
-Create or attach PXE client machines to the network boot environment on the `docker0` bridge.
-
-### libvirt VM
-
-Create libvirt VM nodes configured to boot from the network. The `scripts/libvirt` script will create four VM nodes with known hardware attributes, on the `docker0` bridge network.
-
-    sudo ./scripts/libvirt
-    USAGE: libvirt <command>
-    Commands:
-        create-docker create 4 libvirt nodes on the docker0 bridge
-        create-rkt    create 4 libvirt nodes on a rkt CNI metal0 bridge
-        start         start the 4 libvirt nodes
-        reboot        reboot the 4 libvirt nodes
-        shutdown      shutdown the 4 libvirt nodes
-        poweroff      poweroff the 4 libvirt nodes
-        destroy       destroy the 4 libvirt nodes
-        remove-disks  delete the allocated disks
-
-You may use `virt-manager` to create your own VMs and view the console/state/attributes of existing VM nodes.
-
-When creating your own VMs, select "Network Boot with PXE" and for network selection use "Specify Shared Device" with the bridge name `docker0`.
-
-Learn more by checking [examples](../examples) for clusters you can provision on clients.
-
-### Bare Metal
-
-Connect a baremetal client machine to your host's `docker0` bridge and ensure the boot firmware (probably BIOS) is configured to prefer PXE booting.
-
-Find the network interface and attach it to the virtual bridge.
-
-    ip link show                      # find new link e.g. enp0s20u2
-    brctl addif docker0 enp0s20u2
-
-Restart the client machine and it should PXE boot using settings from `bootcfg`.
-
-## Next
-
-If you'd like to boot and configure a baremetal machine network, follow the [baremetal guide](physical-hardware.md).

Godeps/Godeps.json

@@ -1,67 +0,0 @@
-{
-	"ImportPath": "github.com/coreos/coreos-baremetal",
-	"GoVersion": "go1.5.3",
-	"Packages": [
-		"./..."
-	],
-	"Deps": [
-		{
-			"ImportPath": "github.com/coreos/coreos-cloudinit/config",
-			"Comment": "v1.8.1-2-g6e1a0f7",
-			"Rev": "6e1a0f7ca8d16ceac0f79d6c6693b2da4624512e"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-systemd/journal",
-			"Comment": "v4-8-gf164f43",
-			"Rev": "f164f437010a16e0443d2d1e68e8e001cdbf1226"
-		},
-		{
-			"ImportPath": "github.com/coreos/ignition/src/config",
-			"Comment": "v0.2.4-5-g9d5b476",
-			"Rev": "9d5b4766ae22e66b25702ffbdc94545f2e0d082c"
-		},
-		{
-			"ImportPath": "github.com/coreos/ignition/third_party/github.com/alecthomas/units",
-			"Comment": "v0.2.4-5-g9d5b476",
-			"Rev": "9d5b4766ae22e66b25702ffbdc94545f2e0d082c"
-		},
-		{
-			"ImportPath": "github.com/coreos/ignition/third_party/github.com/camlistore/camlistore/pkg/errorutil",
-			"Comment": "v0.2.4-5-g9d5b476",
-			"Rev": "9d5b4766ae22e66b25702ffbdc94545f2e0d082c"
-		},
-		{
-			"ImportPath": "github.com/coreos/pkg/capnslog",
-			"Rev": "2c77715c4df99b5420ffcae14ead08f52104065d"
-		},
-		{
-			"ImportPath": "github.com/coreos/pkg/flagutil",
-			"Rev": "2c77715c4df99b5420ffcae14ead08f52104065d"
-		},
-		{
-			"ImportPath": "github.com/coreos/yaml",
-			"Rev": "6b16a5714269b2f70720a45406b1babd947a17ef"
-		},
-		{
-			"ImportPath": "github.com/stretchr/testify/assert",
-			"Comment": "v1.0-71-g0d5a14c",
-			"Rev": "0d5a14c5a477957864f3b747d95255ad4e34bcc0"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/cast5",
-			"Rev": "3760e016850398b85094c4c99e955b8c3dea5711"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/openpgp",
-			"Rev": "3760e016850398b85094c4c99e955b8c3dea5711"
-		},
-		{
-			"ImportPath": "golang.org/x/net/context",
-			"Rev": "d75b1902409c457a51e4bd1895031872c370983a"
-		},
-		{
-			"ImportPath": "gopkg.in/yaml.v2",
-			"Rev": "49c95bdc21843256fb6c4e0d370a05f24a0bf213"
-		}
-	]
-}

Godeps/Readme

@@ -1,5 +0,0 @@
-This directory tree is generated automatically by godep.
-
-Please do not edit.
-
-See https://github.com/tools/godep for more information.

Godeps/_workspace/.gitignore

@@ -1,2 +0,0 @@
-/pkg
-/bin

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/config.go

@@ -1,154 +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 config
-
-import (
-	"fmt"
-	"reflect"
-	"regexp"
-	"strings"
-	"unicode"
-
-	"github.com/coreos/yaml"
-)
-
-// CloudConfig encapsulates the entire cloud-config configuration file and maps
-// directly to YAML. Fields that cannot be set in the cloud-config (fields
-// used for internal use) have the YAML tag '-' so that they aren't marshalled.
-type CloudConfig struct {
-	SSHAuthorizedKeys []string `yaml:"ssh_authorized_keys"`
-	CoreOS            CoreOS   `yaml:"coreos"`
-	WriteFiles        []File   `yaml:"write_files"`
-	Hostname          string   `yaml:"hostname"`
-	Users             []User   `yaml:"users"`
-	ManageEtcHosts    EtcHosts `yaml:"manage_etc_hosts"`
-}
-
-type CoreOS struct {
-	Etcd      Etcd      `yaml:"etcd"`
-	Etcd2     Etcd2     `yaml:"etcd2"`
-	Flannel   Flannel   `yaml:"flannel"`
-	Fleet     Fleet     `yaml:"fleet"`
-	Locksmith Locksmith `yaml:"locksmith"`
-	OEM       OEM       `yaml:"oem"`
-	Update    Update    `yaml:"update"`
-	Units     []Unit    `yaml:"units"`
-}
-
-func IsCloudConfig(userdata string) bool {
-	header := strings.SplitN(userdata, "\n", 2)[0]
-
-	// Trim trailing whitespaces
-	header = strings.TrimRightFunc(header, unicode.IsSpace)
-
-	return (header == "#cloud-config")
-}
-
-// NewCloudConfig instantiates a new CloudConfig from the given contents (a
-// string of YAML), returning any error encountered. It will ignore unknown
-// fields but log encountering them.
-func NewCloudConfig(contents string) (*CloudConfig, error) {
-	yaml.UnmarshalMappingKeyTransform = func(nameIn string) (nameOut string) {
-		return strings.Replace(nameIn, "-", "_", -1)
-	}
-	var cfg CloudConfig
-	err := yaml.Unmarshal([]byte(contents), &cfg)
-	return &cfg, err
-}
-
-func (cc CloudConfig) String() string {
-	bytes, err := yaml.Marshal(cc)
-	if err != nil {
-		return ""
-	}
-
-	stringified := string(bytes)
-	stringified = fmt.Sprintf("#cloud-config\n%s", stringified)
-
-	return stringified
-}
-
-// IsZero returns whether or not the parameter is the zero value for its type.
-// If the parameter is a struct, only the exported fields are considered.
-func IsZero(c interface{}) bool {
-	return isZero(reflect.ValueOf(c))
-}
-
-type ErrorValid struct {
-	Value string
-	Valid string
-	Field string
-}
-
-func (e ErrorValid) Error() string {
-	return fmt.Sprintf("invalid value %q for option %q (valid options: %q)", e.Value, e.Field, e.Valid)
-}
-
-// AssertStructValid checks the fields in the structure and makes sure that
-// they contain valid values as specified by the 'valid' flag. Empty fields are
-// implicitly valid.
-func AssertStructValid(c interface{}) error {
-	ct := reflect.TypeOf(c)
-	cv := reflect.ValueOf(c)
-	for i := 0; i < ct.NumField(); i++ {
-		ft := ct.Field(i)
-		if !isFieldExported(ft) {
-			continue
-		}
-
-		if err := AssertValid(cv.Field(i), ft.Tag.Get("valid")); err != nil {
-			err.Field = ft.Name
-			return err
-		}
-	}
-	return nil
-}
-
-// AssertValid checks to make sure that the given value is in the list of
-// valid values. Zero values are implicitly valid.
-func AssertValid(value reflect.Value, valid string) *ErrorValid {
-	if valid == "" || isZero(value) {
-		return nil
-	}
-
-	vs := fmt.Sprintf("%v", value.Interface())
-	if m, _ := regexp.MatchString(valid, vs); m {
-		return nil
-	}
-
-	return &ErrorValid{
-		Value: vs,
-		Valid: valid,
-	}
-}
-
-func isZero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Struct:
-		vt := v.Type()
-		for i := 0; i < v.NumField(); i++ {
-			if isFieldExported(vt.Field(i)) && !isZero(v.Field(i)) {
-				return false
-			}
-		}
-		return true
-	default:
-		return v.Interface() == reflect.Zero(v.Type()).Interface()
-	}
-}
-
-func isFieldExported(f reflect.StructField) bool {
-	return f.PkgPath == ""
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/config_test.go

@@ -1,502 +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 config
-
-import (
-	"reflect"
-	"regexp"
-	"strings"
-	"testing"
-)
-
-func TestNewCloudConfig(t *testing.T) {
-	tests := []struct {
-		contents string
-
-		config CloudConfig
-	}{
-		{},
-		{
-			contents: "#cloud-config\nwrite_files:\n  - path: underscore",
-			config:   CloudConfig{WriteFiles: []File{File{Path: "underscore"}}},
-		},
-		{
-			contents: "#cloud-config\nwrite-files:\n  - path: hyphen",
-			config:   CloudConfig{WriteFiles: []File{File{Path: "hyphen"}}},
-		},
-		{
-			contents: "#cloud-config\ncoreos:\n  update:\n    reboot-strategy: off",
-			config:   CloudConfig{CoreOS: CoreOS{Update: Update{RebootStrategy: "off"}}},
-		},
-		{
-			contents: "#cloud-config\ncoreos:\n  update:\n    reboot-strategy: false",
-			config:   CloudConfig{CoreOS: CoreOS{Update: Update{RebootStrategy: "false"}}},
-		},
-		{
-			contents: "#cloud-config\nwrite_files:\n  - permissions: 0744",
-			config:   CloudConfig{WriteFiles: []File{File{RawFilePermissions: "0744"}}},
-		},
-		{
-			contents: "#cloud-config\nwrite_files:\n  - permissions: 744",
-			config:   CloudConfig{WriteFiles: []File{File{RawFilePermissions: "744"}}},
-		},
-		{
-			contents: "#cloud-config\nwrite_files:\n  - permissions: '0744'",
-			config:   CloudConfig{WriteFiles: []File{File{RawFilePermissions: "0744"}}},
-		},
-		{
-			contents: "#cloud-config\nwrite_files:\n  - permissions: '744'",
-			config:   CloudConfig{WriteFiles: []File{File{RawFilePermissions: "744"}}},
-		},
-	}
-
-	for i, tt := range tests {
-		config, err := NewCloudConfig(tt.contents)
-		if err != nil {
-			t.Errorf("bad error (test case #%d): want %v, got %s", i, nil, err)
-		}
-		if !reflect.DeepEqual(&tt.config, config) {
-			t.Errorf("bad config (test case #%d): want %#v, got %#v", i, tt.config, config)
-		}
-	}
-}
-
-func TestIsZero(t *testing.T) {
-	tests := []struct {
-		c interface{}
-
-		empty bool
-	}{
-		{struct{}{}, true},
-		{struct{ a, b string }{}, true},
-		{struct{ A, b string }{}, true},
-		{struct{ A, B string }{}, true},
-		{struct{ A string }{A: "hello"}, false},
-		{struct{ A int }{}, true},
-		{struct{ A int }{A: 1}, false},
-	}
-
-	for _, tt := range tests {
-		if empty := IsZero(tt.c); tt.empty != empty {
-			t.Errorf("bad result (%q): want %t, got %t", tt.c, tt.empty, empty)
-		}
-	}
-}
-
-func TestAssertStructValid(t *testing.T) {
-	tests := []struct {
-		c interface{}
-
-		err error
-	}{
-		{struct{}{}, nil},
-		{struct {
-			A, b string `valid:"^1|2$"`
-		}{}, nil},
-		{struct {
-			A, b string `valid:"^1|2$"`
-		}{A: "1", b: "2"}, nil},
-		{struct {
-			A, b string `valid:"^1|2$"`
-		}{A: "1", b: "hello"}, nil},
-		{struct {
-			A, b string `valid:"^1|2$"`
-		}{A: "hello", b: "2"}, &ErrorValid{Value: "hello", Field: "A", Valid: "^1|2$"}},
-		{struct {
-			A, b int `valid:"^1|2$"`
-		}{}, nil},
-		{struct {
-			A, b int `valid:"^1|2$"`
-		}{A: 1, b: 2}, nil},
-		{struct {
-			A, b int `valid:"^1|2$"`
-		}{A: 1, b: 9}, nil},
-		{struct {
-			A, b int `valid:"^1|2$"`
-		}{A: 9, b: 2}, &ErrorValid{Value: "9", Field: "A", Valid: "^1|2$"}},
-	}
-
-	for _, tt := range tests {
-		if err := AssertStructValid(tt.c); !reflect.DeepEqual(tt.err, err) {
-			t.Errorf("bad result (%q): want %q, got %q", tt.c, tt.err, err)
-		}
-	}
-}
-
-func TestConfigCompile(t *testing.T) {
-	tests := []interface{}{
-		Etcd{},
-		File{},
-		Flannel{},
-		Fleet{},
-		Locksmith{},
-		OEM{},
-		Unit{},
-		Update{},
-	}
-
-	for _, tt := range tests {
-		ttt := reflect.TypeOf(tt)
-		for i := 0; i < ttt.NumField(); i++ {
-			ft := ttt.Field(i)
-			if !isFieldExported(ft) {
-				continue
-			}
-
-			if _, err := regexp.Compile(ft.Tag.Get("valid")); err != nil {
-				t.Errorf("bad regexp(%s.%s): want %v, got %s", ttt.Name(), ft.Name, nil, err)
-			}
-		}
-	}
-}
-
-func TestCloudConfigUnknownKeys(t *testing.T) {
-	contents := `
-coreos: 
-  etcd:
-    discovery: "https://discovery.etcd.io/827c73219eeb2fa5530027c37bf18877"
-  coreos_unknown:
-    foo: "bar"
-section_unknown:
-  dunno:
-    something
-bare_unknown:
-  bar
-write_files:
-  - content: fun
-    path: /var/party
-    file_unknown: nofun
-users:
-  - name: fry
-    passwd: somehash
-    user_unknown: philip
-hostname:
-  foo
-`
-	cfg, err := NewCloudConfig(contents)
-	if err != nil {
-		t.Fatalf("error instantiating CloudConfig with unknown keys: %v", err)
-	}
-	if cfg.Hostname != "foo" {
-		t.Fatalf("hostname not correctly set when invalid keys are present")
-	}
-	if cfg.CoreOS.Etcd.Discovery != "https://discovery.etcd.io/827c73219eeb2fa5530027c37bf18877" {
-		t.Fatalf("etcd section not correctly set when invalid keys are present")
-	}
-	if len(cfg.WriteFiles) < 1 || cfg.WriteFiles[0].Content != "fun" || cfg.WriteFiles[0].Path != "/var/party" {
-		t.Fatalf("write_files section not correctly set when invalid keys are present")
-	}
-	if len(cfg.Users) < 1 || cfg.Users[0].Name != "fry" || cfg.Users[0].PasswordHash != "somehash" {
-		t.Fatalf("users section not correctly set when invalid keys are present")
-	}
-}
-
-// Assert that the parsing of a cloud config file "generally works"
-func TestCloudConfigEmpty(t *testing.T) {
-	cfg, err := NewCloudConfig("")
-	if err != nil {
-		t.Fatalf("Encountered unexpected error :%v", err)
-	}
-
-	keys := cfg.SSHAuthorizedKeys
-	if len(keys) != 0 {
-		t.Error("Parsed incorrect number of SSH keys")
-	}
-
-	if len(cfg.WriteFiles) != 0 {
-		t.Error("Expected zero WriteFiles")
-	}
-
-	if cfg.Hostname != "" {
-		t.Errorf("Expected hostname to be empty, got '%s'", cfg.Hostname)
-	}
-}
-
-// Assert that the parsing of a cloud config file "generally works"
-func TestCloudConfig(t *testing.T) {
-	contents := `
-coreos: 
-  etcd:
-    discovery: "https://discovery.etcd.io/827c73219eeb2fa5530027c37bf18877"
-  update:
-    reboot_strategy: reboot
-  units:
-    - name: 50-eth0.network
-      runtime: yes
-      content: '[Match]
- 
-    Name=eth47
- 
- 
-    [Network]
- 
-    Address=10.209.171.177/19
- 
-'
-  oem:
-    id: rackspace
-    name: Rackspace Cloud Servers
-    version_id: 168.0.0
-    home_url: https://www.rackspace.com/cloud/servers/
-    bug_report_url: https://github.com/coreos/coreos-overlay
-ssh_authorized_keys:
-  - foobar
-  - foobaz
-write_files:
-  - content: |
-      penny
-      elroy
-    path: /etc/dogepack.conf
-    permissions: '0644'
-    owner: root:dogepack
-hostname: trontastic
-`
-	cfg, err := NewCloudConfig(contents)
-	if err != nil {
-		t.Fatalf("Encountered unexpected error :%v", err)
-	}
-
-	keys := cfg.SSHAuthorizedKeys
-	if len(keys) != 2 {
-		t.Error("Parsed incorrect number of SSH keys")
-	} else if keys[0] != "foobar" {
-		t.Error("Expected first SSH key to be 'foobar'")
-	} else if keys[1] != "foobaz" {
-		t.Error("Expected first SSH key to be 'foobaz'")
-	}
-
-	if len(cfg.WriteFiles) != 1 {
-		t.Error("Failed to parse correct number of write_files")
-	} else {
-		wf := cfg.WriteFiles[0]
-		if wf.Content != "penny\nelroy\n" {
-			t.Errorf("WriteFile has incorrect contents '%s'", wf.Content)
-		}
-		if wf.Encoding != "" {
-			t.Errorf("WriteFile has incorrect encoding %s", wf.Encoding)
-		}
-		if wf.RawFilePermissions != "0644" {
-			t.Errorf("WriteFile has incorrect permissions %s", wf.RawFilePermissions)
-		}
-		if wf.Path != "/etc/dogepack.conf" {
-			t.Errorf("WriteFile has incorrect path %s", wf.Path)
-		}
-		if wf.Owner != "root:dogepack" {
-			t.Errorf("WriteFile has incorrect owner %s", wf.Owner)
-		}
-	}
-
-	if len(cfg.CoreOS.Units) != 1 {
-		t.Error("Failed to parse correct number of units")
-	} else {
-		u := cfg.CoreOS.Units[0]
-		expect := `[Match]
-Name=eth47
-
-[Network]
-Address=10.209.171.177/19
-`
-		if u.Content != expect {
-			t.Errorf("Unit has incorrect contents '%s'.\nExpected '%s'.", u.Content, expect)
-		}
-		if u.Runtime != true {
-			t.Errorf("Unit has incorrect runtime value")
-		}
-		if u.Name != "50-eth0.network" {
-			t.Errorf("Unit has incorrect name %s", u.Name)
-		}
-	}
-
-	if cfg.CoreOS.OEM.ID != "rackspace" {
-		t.Errorf("Failed parsing coreos.oem. Expected ID 'rackspace', got %q.", cfg.CoreOS.OEM.ID)
-	}
-
-	if cfg.Hostname != "trontastic" {
-		t.Errorf("Failed to parse hostname")
-	}
-	if cfg.CoreOS.Update.RebootStrategy != "reboot" {
-		t.Errorf("Failed to parse locksmith strategy")
-	}
-}
-
-// Assert that our interface conversion doesn't panic
-func TestCloudConfigKeysNotList(t *testing.T) {
-	contents := `
-ssh_authorized_keys:
-  - foo: bar
-`
-	cfg, err := NewCloudConfig(contents)
-	if err != nil {
-		t.Fatalf("Encountered unexpected error: %v", err)
-	}
-
-	keys := cfg.SSHAuthorizedKeys
-	if len(keys) != 0 {
-		t.Error("Parsed incorrect number of SSH keys")
-	}
-}
-
-func TestCloudConfigSerializationHeader(t *testing.T) {
-	cfg, _ := NewCloudConfig("")
-	contents := cfg.String()
-	header := strings.SplitN(contents, "\n", 2)[0]
-	if header != "#cloud-config" {
-		t.Fatalf("Serialized config did not have expected header")
-	}
-}
-
-func TestCloudConfigUsers(t *testing.T) {
-	contents := `
-users:
-  - name: elroy
-    passwd: somehash
-    ssh_authorized_keys:
-      - somekey
-    gecos: arbitrary comment
-    homedir: /home/place
-    no_create_home: yes
-    primary_group: things
-    groups:
-      - ping
-      - pong
-    no_user_group: true
-    system: y
-    no_log_init: True
-    shell: /bin/sh
-`
-	cfg, err := NewCloudConfig(contents)
-	if err != nil {
-		t.Fatalf("Encountered unexpected error: %v", err)
-	}
-
-	if len(cfg.Users) != 1 {
-		t.Fatalf("Parsed %d users, expected 1", len(cfg.Users))
-	}
-
-	user := cfg.Users[0]
-
-	if user.Name != "elroy" {
-		t.Errorf("User name is %q, expected 'elroy'", user.Name)
-	}
-
-	if user.PasswordHash != "somehash" {
-		t.Errorf("User passwd is %q, expected 'somehash'", user.PasswordHash)
-	}
-
-	if keys := user.SSHAuthorizedKeys; len(keys) != 1 {
-		t.Errorf("Parsed %d ssh keys, expected 1", len(keys))
-	} else {
-		key := user.SSHAuthorizedKeys[0]
-		if key != "somekey" {
-			t.Errorf("User SSH key is %q, expected 'somekey'", key)
-		}
-	}
-
-	if user.GECOS != "arbitrary comment" {
-		t.Errorf("Failed to parse gecos field, got %q", user.GECOS)
-	}
-
-	if user.Homedir != "/home/place" {
-		t.Errorf("Failed to parse homedir field, got %q", user.Homedir)
-	}
-
-	if !user.NoCreateHome {
-		t.Errorf("Failed to parse no_create_home field")
-	}
-
-	if user.PrimaryGroup != "things" {
-		t.Errorf("Failed to parse primary_group field, got %q", user.PrimaryGroup)
-	}
-
-	if len(user.Groups) != 2 {
-		t.Errorf("Failed to parse 2 goups, got %d", len(user.Groups))
-	} else {
-		if user.Groups[0] != "ping" {
-			t.Errorf("First group was %q, not expected value 'ping'", user.Groups[0])
-		}
-		if user.Groups[1] != "pong" {
-			t.Errorf("First group was %q, not expected value 'pong'", user.Groups[1])
-		}
-	}
-
-	if !user.NoUserGroup {
-		t.Errorf("Failed to parse no_user_group field")
-	}
-
-	if !user.System {
-		t.Errorf("Failed to parse system field")
-	}
-
-	if !user.NoLogInit {
-		t.Errorf("Failed to parse no_log_init field")
-	}
-
-	if user.Shell != "/bin/sh" {
-		t.Errorf("Failed to parse shell field, got %q", user.Shell)
-	}
-}
-
-func TestCloudConfigUsersGithubUser(t *testing.T) {
-
-	contents := `
-users:
-  - name: elroy
-    coreos_ssh_import_github: bcwaldon
-`
-	cfg, err := NewCloudConfig(contents)
-	if err != nil {
-		t.Fatalf("Encountered unexpected error: %v", err)
-	}
-
-	if len(cfg.Users) != 1 {
-		t.Fatalf("Parsed %d users, expected 1", len(cfg.Users))
-	}
-
-	user := cfg.Users[0]
-
-	if user.Name != "elroy" {
-		t.Errorf("User name is %q, expected 'elroy'", user.Name)
-	}
-
-	if user.SSHImportGithubUser != "bcwaldon" {
-		t.Errorf("github user is %q, expected 'bcwaldon'", user.SSHImportGithubUser)
-	}
-}
-
-func TestCloudConfigUsersSSHImportURL(t *testing.T) {
-	contents := `
-users:
-  - name: elroy
-    coreos_ssh_import_url: https://token:x-auth-token@github.enterprise.com/api/v3/polvi/keys
-`
-	cfg, err := NewCloudConfig(contents)
-	if err != nil {
-		t.Fatalf("Encountered unexpected error: %v", err)
-	}
-
-	if len(cfg.Users) != 1 {
-		t.Fatalf("Parsed %d users, expected 1", len(cfg.Users))
-	}
-
-	user := cfg.Users[0]
-
-	if user.Name != "elroy" {
-		t.Errorf("User name is %q, expected 'elroy'", user.Name)
-	}
-
-	if user.SSHImportURL != "https://token:x-auth-token@github.enterprise.com/api/v3/polvi/keys" {
-		t.Errorf("ssh import url is %q, expected 'https://token:x-auth-token@github.enterprise.com/api/v3/polvi/keys'", user.SSHImportURL)
-	}
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/decode.go

@@ -1,56 +0,0 @@
-package config
-
-import (
-	"bytes"
-	"compress/gzip"
-	"encoding/base64"
-	"fmt"
-)
-
-func DecodeBase64Content(content string) ([]byte, error) {
-	output, err := base64.StdEncoding.DecodeString(content)
-
-	if err != nil {
-		return nil, fmt.Errorf("Unable to decode base64: %q", err)
-	}
-
-	return output, nil
-}
-
-func DecodeGzipContent(content string) ([]byte, error) {
-	gzr, err := gzip.NewReader(bytes.NewReader([]byte(content)))
-
-	if err != nil {
-		return nil, fmt.Errorf("Unable to decode gzip: %q", err)
-	}
-	defer gzr.Close()
-
-	buf := new(bytes.Buffer)
-	buf.ReadFrom(gzr)
-
-	return buf.Bytes(), nil
-}
-
-func DecodeContent(content string, encoding string) ([]byte, error) {
-	switch encoding {
-	case "":
-		return []byte(content), nil
-
-	case "b64", "base64":
-		return DecodeBase64Content(content)
-
-	case "gz", "gzip":
-		return DecodeGzipContent(content)
-
-	case "gz+base64", "gzip+base64", "gz+b64", "gzip+b64":
-		gz, err := DecodeBase64Content(content)
-
-		if err != nil {
-			return nil, err
-		}
-
-		return DecodeGzipContent(string(gz))
-	}
-
-	return nil, fmt.Errorf("Unsupported encoding %q", encoding)
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/etc_hosts.go

@@ -1,17 +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 config
-
-type EtcHosts string

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/etcd.go

@@ -1,67 +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 config
-
-type Etcd struct {
-	Addr                     string  `yaml:"addr"                          env:"ETCD_ADDR"`
-	AdvertiseClientURLs      string  `yaml:"advertise_client_urls"         env:"ETCD_ADVERTISE_CLIENT_URLS"       deprecated:"etcd2 options no longer work for etcd"`
-	BindAddr                 string  `yaml:"bind_addr"                     env:"ETCD_BIND_ADDR"`
-	CAFile                   string  `yaml:"ca_file"                       env:"ETCD_CA_FILE"`
-	CertFile                 string  `yaml:"cert_file"                     env:"ETCD_CERT_FILE"`
-	ClusterActiveSize        int     `yaml:"cluster_active_size"           env:"ETCD_CLUSTER_ACTIVE_SIZE"`
-	ClusterRemoveDelay       float64 `yaml:"cluster_remove_delay"          env:"ETCD_CLUSTER_REMOVE_DELAY"`
-	ClusterSyncInterval      float64 `yaml:"cluster_sync_interval"         env:"ETCD_CLUSTER_SYNC_INTERVAL"`
-	CorsOrigins              string  `yaml:"cors"                          env:"ETCD_CORS"`
-	DataDir                  string  `yaml:"data_dir"                      env:"ETCD_DATA_DIR"`
-	Discovery                string  `yaml:"discovery"                     env:"ETCD_DISCOVERY"`
-	DiscoveryFallback        string  `yaml:"discovery_fallback"            env:"ETCD_DISCOVERY_FALLBACK"          deprecated:"etcd2 options no longer work for etcd"`
-	DiscoverySRV             string  `yaml:"discovery_srv"                 env:"ETCD_DISCOVERY_SRV"               deprecated:"etcd2 options no longer work for etcd"`
-	DiscoveryProxy           string  `yaml:"discovery_proxy"               env:"ETCD_DISCOVERY_PROXY"             deprecated:"etcd2 options no longer work for etcd"`
-	ElectionTimeout          int     `yaml:"election_timeout"              env:"ETCD_ELECTION_TIMEOUT"            deprecated:"etcd2 options no longer work for etcd"`
-	ForceNewCluster          bool    `yaml:"force_new_cluster"             env:"ETCD_FORCE_NEW_CLUSTER"           deprecated:"etcd2 options no longer work for etcd"`
-	GraphiteHost             string  `yaml:"graphite_host"                 env:"ETCD_GRAPHITE_HOST"`
-	HeartbeatInterval        int     `yaml:"heartbeat_interval"            env:"ETCD_HEARTBEAT_INTERVAL"          deprecated:"etcd2 options no longer work for etcd"`
-	HTTPReadTimeout          float64 `yaml:"http_read_timeout"             env:"ETCD_HTTP_READ_TIMEOUT"`
-	HTTPWriteTimeout         float64 `yaml:"http_write_timeout"            env:"ETCD_HTTP_WRITE_TIMEOUT"`
-	InitialAdvertisePeerURLs string  `yaml:"initial_advertise_peer_urls"   env:"ETCD_INITIAL_ADVERTISE_PEER_URLS" deprecated:"etcd2 options no longer work for etcd"`
-	InitialCluster           string  `yaml:"initial_cluster"               env:"ETCD_INITIAL_CLUSTER"             deprecated:"etcd2 options no longer work for etcd"`
-	InitialClusterState      string  `yaml:"initial_cluster_state"         env:"ETCD_INITIAL_CLUSTER_STATE"       deprecated:"etcd2 options no longer work for etcd"`
-	InitialClusterToken      string  `yaml:"initial_cluster_token"         env:"ETCD_INITIAL_CLUSTER_TOKEN"       deprecated:"etcd2 options no longer work for etcd"`
-	KeyFile                  string  `yaml:"key_file"                      env:"ETCD_KEY_FILE"`
-	ListenClientURLs         string  `yaml:"listen_client_urls"            env:"ETCD_LISTEN_CLIENT_URLS"          deprecated:"etcd2 options no longer work for etcd"`
-	ListenPeerURLs           string  `yaml:"listen_peer_urls"              env:"ETCD_LISTEN_PEER_URLS"            deprecated:"etcd2 options no longer work for etcd"`
-	MaxResultBuffer          int     `yaml:"max_result_buffer"             env:"ETCD_MAX_RESULT_BUFFER"`
-	MaxRetryAttempts         int     `yaml:"max_retry_attempts"            env:"ETCD_MAX_RETRY_ATTEMPTS"`
-	MaxSnapshots             int     `yaml:"max_snapshots"                 env:"ETCD_MAX_SNAPSHOTS"               deprecated:"etcd2 options no longer work for etcd"`
-	MaxWALs                  int     `yaml:"max_wals"                      env:"ETCD_MAX_WALS"                    deprecated:"etcd2 options no longer work for etcd"`
-	Name                     string  `yaml:"name"                          env:"ETCD_NAME"`
-	PeerAddr                 string  `yaml:"peer_addr"                     env:"ETCD_PEER_ADDR"`
-	PeerBindAddr             string  `yaml:"peer_bind_addr"                env:"ETCD_PEER_BIND_ADDR"`
-	PeerCAFile               string  `yaml:"peer_ca_file"                  env:"ETCD_PEER_CA_FILE"`
-	PeerCertFile             string  `yaml:"peer_cert_file"                env:"ETCD_PEER_CERT_FILE"`
-	PeerElectionTimeout      int     `yaml:"peer_election_timeout"         env:"ETCD_PEER_ELECTION_TIMEOUT"`
-	PeerHeartbeatInterval    int     `yaml:"peer_heartbeat_interval"       env:"ETCD_PEER_HEARTBEAT_INTERVAL"`
-	PeerKeyFile              string  `yaml:"peer_key_file"                 env:"ETCD_PEER_KEY_FILE"`
-	Peers                    string  `yaml:"peers"                         env:"ETCD_PEERS"`
-	PeersFile                string  `yaml:"peers_file"                    env:"ETCD_PEERS_FILE"`
-	Proxy                    string  `yaml:"proxy"                         env:"ETCD_PROXY"                       deprecated:"etcd2 options no longer work for etcd"`
-	RetryInterval            float64 `yaml:"retry_interval"                env:"ETCD_RETRY_INTERVAL"`
-	Snapshot                 bool    `yaml:"snapshot"                      env:"ETCD_SNAPSHOT"`
-	SnapshotCount            int     `yaml:"snapshot_count"                env:"ETCD_SNAPSHOTCOUNT"`
-	StrTrace                 string  `yaml:"trace"                         env:"ETCD_TRACE"`
-	Verbose                  bool    `yaml:"verbose"                       env:"ETCD_VERBOSE"`
-	VeryVerbose              bool    `yaml:"very_verbose"                  env:"ETCD_VERY_VERBOSE"`
-	VeryVeryVerbose          bool    `yaml:"very_very_verbose"             env:"ETCD_VERY_VERY_VERBOSE"`
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/etcd2.go

@@ -1,57 +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 config
-
-type Etcd2 struct {
-	AdvertiseClientURLs      string `yaml:"advertise_client_urls"         env:"ETCD_ADVERTISE_CLIENT_URLS"`
-	CAFile                   string `yaml:"ca_file"                       env:"ETCD_CA_FILE"                     deprecated:"ca_file obsoleted by trusted_ca_file and client_cert_auth"`
-	CertFile                 string `yaml:"cert_file"                     env:"ETCD_CERT_FILE"`
-	ClientCertAuth           bool   `yaml:"client_cert_auth"              env:"ETCD_CLIENT_CERT_AUTH"`
-	CorsOrigins              string `yaml:"cors"                          env:"ETCD_CORS"`
-	DataDir                  string `yaml:"data_dir"                      env:"ETCD_DATA_DIR"`
-	Debug                    bool   `yaml:"debug"                         env:"ETCD_DEBUG"`
-	Discovery                string `yaml:"discovery"                     env:"ETCD_DISCOVERY"`
-	DiscoveryFallback        string `yaml:"discovery_fallback"            env:"ETCD_DISCOVERY_FALLBACK"`
-	DiscoverySRV             string `yaml:"discovery_srv"                 env:"ETCD_DISCOVERY_SRV"`
-	DiscoveryProxy           string `yaml:"discovery_proxy"               env:"ETCD_DISCOVERY_PROXY"`
-	ElectionTimeout          int    `yaml:"election_timeout"              env:"ETCD_ELECTION_TIMEOUT"`
-	ForceNewCluster          bool   `yaml:"force_new_cluster"             env:"ETCD_FORCE_NEW_CLUSTER"`
-	HeartbeatInterval        int    `yaml:"heartbeat_interval"            env:"ETCD_HEARTBEAT_INTERVAL"`
-	InitialAdvertisePeerURLs string `yaml:"initial_advertise_peer_urls"   env:"ETCD_INITIAL_ADVERTISE_PEER_URLS"`
-	InitialCluster           string `yaml:"initial_cluster"               env:"ETCD_INITIAL_CLUSTER"`
-	InitialClusterState      string `yaml:"initial_cluster_state"         env:"ETCD_INITIAL_CLUSTER_STATE"`
-	InitialClusterToken      string `yaml:"initial_cluster_token"         env:"ETCD_INITIAL_CLUSTER_TOKEN"`
-	KeyFile                  string `yaml:"key_file"                      env:"ETCD_KEY_FILE"`
-	ListenClientURLs         string `yaml:"listen_client_urls"            env:"ETCD_LISTEN_CLIENT_URLS"`
-	ListenPeerURLs           string `yaml:"listen_peer_urls"              env:"ETCD_LISTEN_PEER_URLS"`
-	LogPackageLevels         string `yaml:"log_package_levels"            env:"ETCD_LOG_PACKAGE_LEVELS"`
-	MaxSnapshots             int    `yaml:"max_snapshots"                 env:"ETCD_MAX_SNAPSHOTS"`
-	MaxWALs                  int    `yaml:"max_wals"                      env:"ETCD_MAX_WALS"`
-	Name                     string `yaml:"name"                          env:"ETCD_NAME"`
-	PeerCAFile               string `yaml:"peer_ca_file"                  env:"ETCD_PEER_CA_FILE"                deprecated:"peer_ca_file obsoleted peer_trusted_ca_file and peer_client_cert_auth"`
-	PeerCertFile             string `yaml:"peer_cert_file"                env:"ETCD_PEER_CERT_FILE"`
-	PeerKeyFile              string `yaml:"peer_key_file"                 env:"ETCD_PEER_KEY_FILE"`
-	PeerClientCertAuth       bool   `yaml:"peer_client_cert_auth"         env:"ETCD_PEER_CLIENT_CERT_AUTH"`
-	PeerTrustedCAFile        string `yaml:"peer_trusted_ca_file"          env:"ETCD_PEER_TRUSTED_CA_FILE"`
-	Proxy                    string `yaml:"proxy"                         env:"ETCD_PROXY"                       valid:"^(on|off|readonly)$"`
-	ProxyDialTimeout         int    `yaml:"proxy_dial_timeout"            env:"ETCD_PROXY_DIAL_TIMEOUT"`
-	ProxyFailureWait         int    `yaml:"proxy_failure_wait"            env:"ETCD_PROXY_FAILURE_WAIT"`
-	ProxyReadTimeout         int    `yaml:"proxy_read_timeout"            env:"ETCD_PROXY_READ_TIMEOUT"`
-	ProxyRefreshInterval     int    `yaml:"proxy_refresh_interval"        env:"ETCD_PROXY_REFRESH_INTERVAL"`
-	ProxyWriteTimeout        int    `yaml:"proxy_write_timeout"           env:"ETCD_PROXY_WRITE_TIMEOUT"`
-	SnapshotCount            int    `yaml:"snapshot_count"                env:"ETCD_SNAPSHOT_COUNT"`
-	TrustedCAFile            string `yaml:"trusted_ca_file"               env:"ETCD_TRUSTED_CA_FILE"`
-	WalDir                   string `yaml:"wal_dir"                       env:"ETCD_WAL_DIR"`
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/file.go

@@ -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 config
-
-type File struct {
-	Encoding           string `yaml:"encoding" valid:"^(base64|b64|gz|gzip|gz\\+base64|gzip\\+base64|gz\\+b64|gzip\\+b64)$"`
-	Content            string `yaml:"content"`
-	Owner              string `yaml:"owner"`
-	Path               string `yaml:"path"`
-	RawFilePermissions string `yaml:"permissions" valid:"^0?[0-7]{3,4}$"`
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/file_test.go

@@ -1,69 +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 config
-
-import (
-	"testing"
-)
-
-func TestEncodingValid(t *testing.T) {
-	tests := []struct {
-		value string
-
-		isValid bool
-	}{
-		{value: "base64", isValid: true},
-		{value: "b64", isValid: true},
-		{value: "gz", isValid: true},
-		{value: "gzip", isValid: true},
-		{value: "gz+base64", isValid: true},
-		{value: "gzip+base64", isValid: true},
-		{value: "gz+b64", isValid: true},
-		{value: "gzip+b64", isValid: true},
-		{value: "gzzzzbase64", isValid: false},
-		{value: "gzipppbase64", isValid: false},
-		{value: "unknown", isValid: false},
-	}
-
-	for _, tt := range tests {
-		isValid := (nil == AssertStructValid(File{Encoding: tt.value}))
-		if tt.isValid != isValid {
-			t.Errorf("bad assert (%s): want %t, got %t", tt.value, tt.isValid, isValid)
-		}
-	}
-}
-
-func TestRawFilePermissionsValid(t *testing.T) {
-	tests := []struct {
-		value string
-
-		isValid bool
-	}{
-		{value: "744", isValid: true},
-		{value: "0744", isValid: true},
-		{value: "1744", isValid: true},
-		{value: "01744", isValid: true},
-		{value: "11744", isValid: false},
-		{value: "rwxr--r--", isValid: false},
-		{value: "800", isValid: false},
-	}
-
-	for _, tt := range tests {
-		isValid := (nil == AssertStructValid(File{RawFilePermissions: tt.value}))
-		if tt.isValid != isValid {
-			t.Errorf("bad assert (%s): want %t, got %t", tt.value, tt.isValid, isValid)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/flannel.go

@@ -1,27 +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 config
-
-type Flannel struct {
-	EtcdEndpoints string `yaml:"etcd_endpoints" env:"FLANNELD_ETCD_ENDPOINTS"`
-	EtcdCAFile    string `yaml:"etcd_cafile"    env:"FLANNELD_ETCD_CAFILE"`
-	EtcdCertFile  string `yaml:"etcd_certfile"  env:"FLANNELD_ETCD_CERTFILE"`
-	EtcdKeyFile   string `yaml:"etcd_keyfile"   env:"FLANNELD_ETCD_KEYFILE"`
-	EtcdPrefix    string `yaml:"etcd_prefix"    env:"FLANNELD_ETCD_PREFIX"`
-	IPMasq        string `yaml:"ip_masq"        env:"FLANNELD_IP_MASQ"`
-	SubnetFile    string `yaml:"subnet_file"    env:"FLANNELD_SUBNET_FILE"`
-	Iface         string `yaml:"interface"      env:"FLANNELD_IFACE"`
-	PublicIP      string `yaml:"public_ip"      env:"FLANNELD_PUBLIC_IP"`
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/fleet.go

@@ -1,33 +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 config
-
-type Fleet struct {
-	AgentTTL                string  `yaml:"agent_ttl"                 env:"FLEET_AGENT_TTL"`
-	AuthorizedKeysFile      string  `yaml:"authorized_keys_file"      env:"FLEET_AUTHORIZED_KEYS_FILE"`
-	DisableEngine           bool    `yaml:"disable_engine"            env:"FLEET_DISABLE_ENGINE"`
-	EngineReconcileInterval float64 `yaml:"engine_reconcile_interval" env:"FLEET_ENGINE_RECONCILE_INTERVAL"`
-	EtcdCAFile              string  `yaml:"etcd_cafile"               env:"FLEET_ETCD_CAFILE"`
-	EtcdCertFile            string  `yaml:"etcd_certfile"             env:"FLEET_ETCD_CERTFILE"`
-	EtcdKeyFile             string  `yaml:"etcd_keyfile"              env:"FLEET_ETCD_KEYFILE"`
-	EtcdKeyPrefix           string  `yaml:"etcd_key_prefix"           env:"FLEET_ETCD_KEY_PREFIX"`
-	EtcdRequestTimeout      float64 `yaml:"etcd_request_timeout"      env:"FLEET_ETCD_REQUEST_TIMEOUT"`
-	EtcdServers             string  `yaml:"etcd_servers"              env:"FLEET_ETCD_SERVERS"`
-	Metadata                string  `yaml:"metadata"                  env:"FLEET_METADATA"`
-	PublicIP                string  `yaml:"public_ip"                 env:"FLEET_PUBLIC_IP"`
-	TokenLimit              int     `yaml:"token_limit"               env:"FLEET_TOKEN_LIMIT"`
-	Verbosity               int     `yaml:"verbosity"                 env:"FLEET_VERBOSITY"`
-	VerifyUnits             bool    `yaml:"verify_units"              env:"FLEET_VERIFY_UNITS"`
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/ignition.go

@@ -1,26 +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 config
-
-import (
-	"encoding/json"
-)
-
-func IsIgnitionConfig(userdata string) bool {
-	var cfg struct {
-		Version *int `json:"ignitionVersion" yaml:"ignition_version"`
-	}
-	return (json.Unmarshal([]byte(userdata), &cfg) == nil && cfg.Version != nil)
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/locksmith.go

@@ -1,25 +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 config
-
-type Locksmith struct {
-	Endpoint           string `yaml:"endpoint"      env:"LOCKSMITHD_ENDPOINT"`
-	EtcdCAFile         string `yaml:"etcd_cafile"   env:"LOCKSMITHD_ETCD_CAFILE"`
-	EtcdCertFile       string `yaml:"etcd_certfile" env:"LOCKSMITHD_ETCD_CERTFILE"`
-	EtcdKeyFile        string `yaml:"etcd_keyfile"  env:"LOCKSMITHD_ETCD_KEYFILE"`
-	Group              string `yaml:"group"         env:"LOCKSMITHD_GROUP"`
-	RebootWindowStart  string `yaml:"window_start"  env:"REBOOT_WINDOW_START"  valid:"^((?i:sun|mon|tue|wed|thu|fri|sat|sun) )?0*([0-9]|1[0-9]|2[0-3]):0*([0-9]|[1-5][0-9])$"`
-	RebootWindowLength string `yaml:"window_length" env:"REBOOT_WINDOW_LENGTH" valid:"^[-+]?([0-9]*(\\.[0-9]*)?[a-z]+)+$"`
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/locksmith_test.go

@@ -1,76 +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 config
-
-import (
-	"testing"
-)
-
-func TestRebootWindowStart(t *testing.T) {
-	tests := []struct {
-		value string
-
-		isValid bool
-	}{
-		{value: "Sun 0:0", isValid: true},
-		{value: "Sun 00:00", isValid: true},
-		{value: "sUn 23:59", isValid: true},
-		{value: "mon 0:0", isValid: true},
-		{value: "tue 0:0", isValid: true},
-		{value: "tues 0:0", isValid: false},
-		{value: "wed 0:0", isValid: true},
-		{value: "thu 0:0", isValid: true},
-		{value: "thur 0:0", isValid: false},
-		{value: "fri 0:0", isValid: true},
-		{value: "sat 0:0", isValid: true},
-		{value: "sat00:00", isValid: false},
-		{value: "00:00", isValid: true},
-		{value: "10:10", isValid: true},
-		{value: "20:20", isValid: true},
-		{value: "20:30", isValid: true},
-		{value: "20:40", isValid: true},
-		{value: "20:50", isValid: true},
-		{value: "20:60", isValid: false},
-		{value: "24:00", isValid: false},
-	}
-
-	for _, tt := range tests {
-		isValid := (nil == AssertStructValid(Locksmith{RebootWindowStart: tt.value}))
-		if tt.isValid != isValid {
-			t.Errorf("bad assert (%s): want %t, got %t", tt.value, tt.isValid, isValid)
-		}
-	}
-}
-
-func TestRebootWindowLength(t *testing.T) {
-	tests := []struct {
-		value string
-
-		isValid bool
-	}{
-		{value: "1h", isValid: true},
-		{value: "1d", isValid: true},
-		{value: "0d", isValid: true},
-		{value: "0.5h", isValid: true},
-		{value: "0.5.0h", isValid: false},
-	}
-
-	for _, tt := range tests {
-		isValid := (nil == AssertStructValid(Locksmith{RebootWindowLength: tt.value}))
-		if tt.isValid != isValid {
-			t.Errorf("bad assert (%s): want %t, got %t", tt.value, tt.isValid, isValid)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/oem.go

@@ -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 config
-
-type OEM struct {
-	ID           string `yaml:"id"`
-	Name         string `yaml:"name"`
-	VersionID    string `yaml:"version_id"`
-	HomeURL      string `yaml:"home_url"`
-	BugReportURL string `yaml:"bug_report_url"`
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/script.go

@@ -1,31 +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 config
-
-import (
-	"strings"
-)
-
-type Script []byte
-
-func IsScript(userdata string) bool {
-	header := strings.SplitN(userdata, "\n", 2)[0]
-	return strings.HasPrefix(header, "#!")
-}
-
-func NewScript(userdata string) (*Script, error) {
-	s := Script(userdata)
-	return &s, nil
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/unit.go

@@ -1,30 +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 config
-
-type Unit struct {
-	Name    string       `yaml:"name"`
-	Mask    bool         `yaml:"mask"`
-	Enable  bool         `yaml:"enable"`
-	Runtime bool         `yaml:"runtime"`
-	Content string       `yaml:"content"`
-	Command string       `yaml:"command" valid:"^(start|stop|restart|reload|try-restart|reload-or-restart|reload-or-try-restart)$"`
-	DropIns []UnitDropIn `yaml:"drop_ins"`
-}
-
-type UnitDropIn struct {
-	Name    string `yaml:"name"`
-	Content string `yaml:"content"`
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/unit_test.go

@@ -1,46 +0,0 @@
-/*
-   Copyright 2014 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 config
-
-import (
-	"testing"
-)
-
-func TestCommandValid(t *testing.T) {
-	tests := []struct {
-		value string
-
-		isValid bool
-	}{
-		{value: "start", isValid: true},
-		{value: "stop", isValid: true},
-		{value: "restart", isValid: true},
-		{value: "reload", isValid: true},
-		{value: "try-restart", isValid: true},
-		{value: "reload-or-restart", isValid: true},
-		{value: "reload-or-try-restart", isValid: true},
-		{value: "tryrestart", isValid: false},
-		{value: "unknown", isValid: false},
-	}
-
-	for _, tt := range tests {
-		isValid := (nil == AssertStructValid(Unit{Command: tt.value}))
-		if tt.isValid != isValid {
-			t.Errorf("bad assert (%s): want %t, got %t", tt.value, tt.isValid, isValid)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/update.go

@@ -1,21 +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 config
-
-type Update struct {
-	RebootStrategy string `yaml:"reboot_strategy" env:"REBOOT_STRATEGY" valid:"^(best-effort|etcd-lock|reboot|off)$"`
-	Group          string `yaml:"group"           env:"GROUP"`
-	Server         string `yaml:"server"          env:"SERVER"`
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/update_test.go

@@ -1,43 +0,0 @@
-/*
-   Copyright 2014 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 config
-
-import (
-	"testing"
-)
-
-func TestRebootStrategyValid(t *testing.T) {
-	tests := []struct {
-		value string
-
-		isValid bool
-	}{
-		{value: "best-effort", isValid: true},
-		{value: "etcd-lock", isValid: true},
-		{value: "reboot", isValid: true},
-		{value: "off", isValid: true},
-		{value: "besteffort", isValid: false},
-		{value: "unknown", isValid: false},
-	}
-
-	for _, tt := range tests {
-		isValid := (nil == AssertStructValid(Update{RebootStrategy: tt.value}))
-		if tt.isValid != isValid {
-			t.Errorf("bad assert (%s): want %t, got %t", tt.value, tt.isValid, isValid)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/user.go

@@ -1,33 +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 config
-
-type User struct {
-	Name                 string   `yaml:"name"`
-	PasswordHash         string   `yaml:"passwd"`
-	SSHAuthorizedKeys    []string `yaml:"ssh_authorized_keys"`
-	SSHImportGithubUser  string   `yaml:"coreos_ssh_import_github"       deprecated:"trying to fetch from a remote endpoint introduces too many intermittent errors"`
-	SSHImportGithubUsers []string `yaml:"coreos_ssh_import_github_users" deprecated:"trying to fetch from a remote endpoint introduces too many intermittent errors"`
-	SSHImportURL         string   `yaml:"coreos_ssh_import_url"          deprecated:"trying to fetch from a remote endpoint introduces too many intermittent errors"`
-	GECOS                string   `yaml:"gecos"`
-	Homedir              string   `yaml:"homedir"`
-	NoCreateHome         bool     `yaml:"no_create_home"`
-	PrimaryGroup         string   `yaml:"primary_group"`
-	Groups               []string `yaml:"groups"`
-	NoUserGroup          bool     `yaml:"no_user_group"`
-	System               bool     `yaml:"system"`
-	NoLogInit            bool     `yaml:"no_log_init"`
-	Shell                string   `yaml:"shell"`
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/validate/context.go

@@ -1,52 +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 validate
-
-import (
-	"strings"
-)
-
-// context represents the current position within a newline-delimited string.
-// Each line is loaded, one by one, into currentLine (newline omitted) and
-// lineNumber keeps track of its position within the original string.
-type context struct {
-	currentLine    string
-	remainingLines string
-	lineNumber     int
-}
-
-// Increment moves the context to the next line (if available).
-func (c *context) Increment() {
-	if c.currentLine == "" && c.remainingLines == "" {
-		return
-	}
-
-	lines := strings.SplitN(c.remainingLines, "\n", 2)
-	c.currentLine = lines[0]
-	if len(lines) == 2 {
-		c.remainingLines = lines[1]
-	} else {
-		c.remainingLines = ""
-	}
-	c.lineNumber++
-}
-
-// NewContext creates a context from the provided data. It strips out all
-// carriage returns and moves to the first line (if available).
-func NewContext(content []byte) context {
-	c := context{remainingLines: strings.Replace(string(content), "\r", "", -1)}
-	c.Increment()
-	return c
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/validate/context_test.go

@@ -1,131 +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 validate
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestNewContext(t *testing.T) {
-	tests := []struct {
-		in string
-
-		out context
-	}{
-		{
-			out: context{
-				currentLine:    "",
-				remainingLines: "",
-				lineNumber:     0,
-			},
-		},
-		{
-			in: "this\r\nis\r\na\r\ntest",
-			out: context{
-				currentLine:    "this",
-				remainingLines: "is\na\ntest",
-				lineNumber:     1,
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		if out := NewContext([]byte(tt.in)); !reflect.DeepEqual(tt.out, out) {
-			t.Errorf("bad context (%q): want %#v, got %#v", tt.in, tt.out, out)
-		}
-	}
-}
-
-func TestIncrement(t *testing.T) {
-	tests := []struct {
-		init context
-		op   func(c *context)
-
-		res context
-	}{
-		{
-			init: context{
-				currentLine:    "",
-				remainingLines: "",
-				lineNumber:     0,
-			},
-			res: context{
-				currentLine:    "",
-				remainingLines: "",
-				lineNumber:     0,
-			},
-			op: func(c *context) {
-				c.Increment()
-			},
-		},
-		{
-			init: context{
-				currentLine:    "test",
-				remainingLines: "",
-				lineNumber:     1,
-			},
-			res: context{
-				currentLine:    "",
-				remainingLines: "",
-				lineNumber:     2,
-			},
-			op: func(c *context) {
-				c.Increment()
-				c.Increment()
-				c.Increment()
-			},
-		},
-		{
-			init: context{
-				currentLine:    "this",
-				remainingLines: "is\na\ntest",
-				lineNumber:     1,
-			},
-			res: context{
-				currentLine:    "is",
-				remainingLines: "a\ntest",
-				lineNumber:     2,
-			},
-			op: func(c *context) {
-				c.Increment()
-			},
-		},
-		{
-			init: context{
-				currentLine:    "this",
-				remainingLines: "is\na\ntest",
-				lineNumber:     1,
-			},
-			res: context{
-				currentLine:    "test",
-				remainingLines: "",
-				lineNumber:     4,
-			},
-			op: func(c *context) {
-				c.Increment()
-				c.Increment()
-				c.Increment()
-			},
-		},
-	}
-
-	for i, tt := range tests {
-		res := tt.init
-		if tt.op(&res); !reflect.DeepEqual(tt.res, res) {
-			t.Errorf("bad context (%d, %#v): want %#v, got %#v", i, tt.init, tt.res, res)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/validate/node.go

@@ -1,157 +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 validate
-
-import (
-	"fmt"
-	"reflect"
-	"regexp"
-)
-
-var (
-	yamlKey  = regexp.MustCompile(`^ *-? ?(?P<key>.*?):`)
-	yamlElem = regexp.MustCompile(`^ *-`)
-)
-
-type node struct {
-	name     string
-	line     int
-	children []node
-	field    reflect.StructField
-	reflect.Value
-}
-
-// Child attempts to find the child with the given name in the node's list of
-// children. If no such child is found, an invalid node is returned.
-func (n node) Child(name string) node {
-	for _, c := range n.children {
-		if c.name == name {
-			return c
-		}
-	}
-	return node{}
-}
-
-// HumanType returns the human-consumable string representation of the type of
-// the node.
-func (n node) HumanType() string {
-	switch k := n.Kind(); k {
-	case reflect.Slice:
-		c := n.Type().Elem()
-		return "[]" + node{Value: reflect.New(c).Elem()}.HumanType()
-	default:
-		return k.String()
-	}
-}
-
-// NewNode returns the node representation of the given value. The context
-// will be used in an attempt to determine line numbers for the given value.
-func NewNode(value interface{}, context context) node {
-	var n node
-	toNode(value, context, &n)
-	return n
-}
-
-// toNode converts the given value into a node and then recursively processes
-// each of the nodes components (e.g. fields, array elements, keys).
-func toNode(v interface{}, c context, n *node) {
-	vv := reflect.ValueOf(v)
-	if !vv.IsValid() {
-		return
-	}
-
-	n.Value = vv
-	switch vv.Kind() {
-	case reflect.Struct:
-		// Walk over each field in the structure, skipping unexported fields,
-		// and create a node for it.
-		for i := 0; i < vv.Type().NumField(); i++ {
-			ft := vv.Type().Field(i)
-			k := ft.Tag.Get("yaml")
-			if k == "-" || k == "" {
-				continue
-			}
-
-			cn := node{name: k, field: ft}
-			c, ok := findKey(cn.name, c)
-			if ok {
-				cn.line = c.lineNumber
-			}
-			toNode(vv.Field(i).Interface(), c, &cn)
-			n.children = append(n.children, cn)
-		}
-	case reflect.Map:
-		// Walk over each key in the map and create a node for it.
-		v := v.(map[interface{}]interface{})
-		for k, cv := range v {
-			cn := node{name: fmt.Sprintf("%s", k)}
-			c, ok := findKey(cn.name, c)
-			if ok {
-				cn.line = c.lineNumber
-			}
-			toNode(cv, c, &cn)
-			n.children = append(n.children, cn)
-		}
-	case reflect.Slice:
-		// Walk over each element in the slice and create a node for it.
-		// While iterating over the slice, preserve the context after it
-		// is modified. This allows the line numbers to reflect the current
-		// element instead of the first.
-		for i := 0; i < vv.Len(); i++ {
-			cn := node{
-				name:  fmt.Sprintf("%s[%d]", n.name, i),
-				field: n.field,
-			}
-			var ok bool
-			c, ok = findElem(c)
-			if ok {
-				cn.line = c.lineNumber
-			}
-			toNode(vv.Index(i).Interface(), c, &cn)
-			n.children = append(n.children, cn)
-			c.Increment()
-		}
-	case reflect.String, reflect.Int, reflect.Bool, reflect.Float64:
-	default:
-		panic(fmt.Sprintf("toNode(): unhandled kind %s", vv.Kind()))
-	}
-}
-
-// findKey attempts to find the requested key within the provided context.
-// A modified copy of the context is returned with every line up to the key
-// incremented past. A boolean, true if the key was found, is also returned.
-func findKey(key string, context context) (context, bool) {
-	return find(yamlKey, key, context)
-}
-
-// findElem attempts to find an array element within the provided context.
-// A modified copy of the context is returned with every line up to the array
-// element incremented past. A boolean, true if the key was found, is also
-// returned.
-func findElem(context context) (context, bool) {
-	return find(yamlElem, "", context)
-}
-
-func find(exp *regexp.Regexp, key string, context context) (context, bool) {
-	for len(context.currentLine) > 0 || len(context.remainingLines) > 0 {
-		matches := exp.FindStringSubmatch(context.currentLine)
-		if len(matches) > 0 && (key == "" || matches[1] == key) {
-			return context, true
-		}
-
-		context.Increment()
-	}
-	return context, false
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/validate/node_test.go

@@ -1,284 +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 validate
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestChild(t *testing.T) {
-	tests := []struct {
-		parent node
-		name   string
-
-		child node
-	}{
-		{},
-		{
-			name: "c1",
-		},
-		{
-			parent: node{
-				children: []node{
-					node{name: "c1"},
-					node{name: "c2"},
-					node{name: "c3"},
-				},
-			},
-		},
-		{
-			parent: node{
-				children: []node{
-					node{name: "c1"},
-					node{name: "c2"},
-					node{name: "c3"},
-				},
-			},
-			name:  "c2",
-			child: node{name: "c2"},
-		},
-	}
-
-	for _, tt := range tests {
-		if child := tt.parent.Child(tt.name); !reflect.DeepEqual(tt.child, child) {
-			t.Errorf("bad child (%q): want %#v, got %#v", tt.name, tt.child, child)
-		}
-	}
-}
-
-func TestHumanType(t *testing.T) {
-	tests := []struct {
-		node node
-
-		humanType string
-	}{
-		{
-			humanType: "invalid",
-		},
-		{
-			node:      node{Value: reflect.ValueOf("hello")},
-			humanType: "string",
-		},
-		{
-			node: node{
-				Value: reflect.ValueOf([]int{1, 2}),
-				children: []node{
-					node{Value: reflect.ValueOf(1)},
-					node{Value: reflect.ValueOf(2)},
-				}},
-			humanType: "[]int",
-		},
-	}
-
-	for _, tt := range tests {
-		if humanType := tt.node.HumanType(); tt.humanType != humanType {
-			t.Errorf("bad type (%q): want %q, got %q", tt.node, tt.humanType, humanType)
-		}
-	}
-}
-
-func TestToNode(t *testing.T) {
-	tests := []struct {
-		value   interface{}
-		context context
-
-		node node
-	}{
-		{},
-		{
-			value: struct{}{},
-			node:  node{Value: reflect.ValueOf(struct{}{})},
-		},
-		{
-			value: struct {
-				A int `yaml:"a"`
-			}{},
-			node: node{
-				children: []node{
-					node{
-						name: "a",
-						field: reflect.TypeOf(struct {
-							A int `yaml:"a"`
-						}{}).Field(0),
-					},
-				},
-			},
-		},
-		{
-			value: struct {
-				A []int `yaml:"a"`
-			}{},
-			node: node{
-				children: []node{
-					node{
-						name: "a",
-						field: reflect.TypeOf(struct {
-							A []int `yaml:"a"`
-						}{}).Field(0),
-					},
-				},
-			},
-		},
-		{
-			value: map[interface{}]interface{}{
-				"a": map[interface{}]interface{}{
-					"b": 2,
-				},
-			},
-			context: NewContext([]byte("a:\n  b: 2")),
-			node: node{
-				children: []node{
-					node{
-						line: 1,
-						name: "a",
-						children: []node{
-							node{name: "b", line: 2},
-						},
-					},
-				},
-			},
-		},
-		{
-			value: struct {
-				A struct {
-					Jon bool `yaml:"b"`
-				} `yaml:"a"`
-			}{},
-			node: node{
-				children: []node{
-					node{
-						name: "a",
-						children: []node{
-							node{
-								name: "b",
-								field: reflect.TypeOf(struct {
-									Jon bool `yaml:"b"`
-								}{}).Field(0),
-								Value: reflect.ValueOf(false),
-							},
-						},
-						field: reflect.TypeOf(struct {
-							A struct {
-								Jon bool `yaml:"b"`
-							} `yaml:"a"`
-						}{}).Field(0),
-						Value: reflect.ValueOf(struct {
-							Jon bool `yaml:"b"`
-						}{}),
-					},
-				},
-				Value: reflect.ValueOf(struct {
-					A struct {
-						Jon bool `yaml:"b"`
-					} `yaml:"a"`
-				}{}),
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		var node node
-		toNode(tt.value, tt.context, &node)
-		if !nodesEqual(tt.node, node) {
-			t.Errorf("bad node (%#v): want %#v, got %#v", tt.value, tt.node, node)
-		}
-	}
-}
-
-func TestFindKey(t *testing.T) {
-	tests := []struct {
-		key     string
-		context context
-
-		found bool
-	}{
-		{},
-		{
-			key:     "key1",
-			context: NewContext([]byte("key1: hi")),
-			found:   true,
-		},
-		{
-			key:     "key2",
-			context: NewContext([]byte("key1: hi")),
-			found:   false,
-		},
-		{
-			key:     "key3",
-			context: NewContext([]byte("key1:\n  key2:\n    key3: hi")),
-			found:   true,
-		},
-		{
-			key:     "key4",
-			context: NewContext([]byte("key1:\n  - key4: hi")),
-			found:   true,
-		},
-		{
-			key:     "key5",
-			context: NewContext([]byte("#key5")),
-			found:   false,
-		},
-	}
-
-	for _, tt := range tests {
-		if _, found := findKey(tt.key, tt.context); tt.found != found {
-			t.Errorf("bad find (%q): want %t, got %t", tt.key, tt.found, found)
-		}
-	}
-}
-
-func TestFindElem(t *testing.T) {
-	tests := []struct {
-		context context
-
-		found bool
-	}{
-		{},
-		{
-			context: NewContext([]byte("test: hi")),
-			found:   false,
-		},
-		{
-			context: NewContext([]byte("test:\n  - a\n  -b")),
-			found:   true,
-		},
-		{
-			context: NewContext([]byte("test:\n  -\n    a")),
-			found:   true,
-		},
-	}
-
-	for _, tt := range tests {
-		if _, found := findElem(tt.context); tt.found != found {
-			t.Errorf("bad find (%q): want %t, got %t", tt.context, tt.found, found)
-		}
-	}
-}
-
-func nodesEqual(a, b node) bool {
-	if a.name != b.name ||
-		a.line != b.line ||
-		!reflect.DeepEqual(a.field, b.field) ||
-		len(a.children) != len(b.children) {
-		return false
-	}
-	for i := 0; i < len(a.children); i++ {
-		if !nodesEqual(a.children[i], b.children[i]) {
-			return false
-		}
-	}
-	return true
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/validate/report.go

@@ -1,88 +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 validate
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-// Report represents the list of entries resulting from validation.
-type Report struct {
-	entries []Entry
-}
-
-// Error adds an error entry to the report.
-func (r *Report) Error(line int, message string) {
-	r.entries = append(r.entries, Entry{entryError, message, line})
-}
-
-// Warning adds a warning entry to the report.
-func (r *Report) Warning(line int, message string) {
-	r.entries = append(r.entries, Entry{entryWarning, message, line})
-}
-
-// Info adds an info entry to the report.
-func (r *Report) Info(line int, message string) {
-	r.entries = append(r.entries, Entry{entryInfo, message, line})
-}
-
-// Entries returns the list of entries in the report.
-func (r *Report) Entries() []Entry {
-	return r.entries
-}
-
-// Entry represents a single generic item in the report.
-type Entry struct {
-	kind    entryKind
-	message string
-	line    int
-}
-
-// String returns a human-readable representation of the entry.
-func (e Entry) String() string {
-	return fmt.Sprintf("line %d: %s: %s", e.line, e.kind, e.message)
-}
-
-// MarshalJSON satisfies the json.Marshaler interface, returning the entry
-// encoded as a JSON object.
-func (e Entry) MarshalJSON() ([]byte, error) {
-	return json.Marshal(map[string]interface{}{
-		"kind":    e.kind.String(),
-		"message": e.message,
-		"line":    e.line,
-	})
-}
-
-type entryKind int
-
-const (
-	entryError entryKind = iota
-	entryWarning
-	entryInfo
-)
-
-func (k entryKind) String() string {
-	switch k {
-	case entryError:
-		return "error"
-	case entryWarning:
-		return "warning"
-	case entryInfo:
-		return "info"
-	default:
-		panic(fmt.Sprintf("invalid kind %d", k))
-	}
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/validate/report_test.go

@@ -1,96 +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 validate
-
-import (
-	"bytes"
-	"reflect"
-	"testing"
-)
-
-func TestEntry(t *testing.T) {
-	tests := []struct {
-		entry Entry
-
-		str  string
-		json []byte
-	}{
-		{
-			Entry{entryInfo, "test info", 1},
-			"line 1: info: test info",
-			[]byte(`{"kind":"info","line":1,"message":"test info"}`),
-		},
-		{
-			Entry{entryWarning, "test warning", 1},
-			"line 1: warning: test warning",
-			[]byte(`{"kind":"warning","line":1,"message":"test warning"}`),
-		},
-		{
-			Entry{entryError, "test error", 2},
-			"line 2: error: test error",
-			[]byte(`{"kind":"error","line":2,"message":"test error"}`),
-		},
-	}
-
-	for _, tt := range tests {
-		if str := tt.entry.String(); tt.str != str {
-			t.Errorf("bad string (%q): want %q, got %q", tt.entry, tt.str, str)
-		}
-		json, err := tt.entry.MarshalJSON()
-		if err != nil {
-			t.Errorf("bad error (%q): want %v, got %q", tt.entry, nil, err)
-		}
-		if !bytes.Equal(tt.json, json) {
-			t.Errorf("bad JSON (%q): want %q, got %q", tt.entry, tt.json, json)
-		}
-	}
-}
-
-func TestReport(t *testing.T) {
-	type reportFunc struct {
-		fn      func(*Report, int, string)
-		line    int
-		message string
-	}
-
-	tests := []struct {
-		fs []reportFunc
-
-		es []Entry
-	}{
-		{
-			[]reportFunc{
-				{(*Report).Warning, 1, "test warning 1"},
-				{(*Report).Error, 2, "test error 2"},
-				{(*Report).Info, 10, "test info 10"},
-			},
-			[]Entry{
-				Entry{entryWarning, "test warning 1", 1},
-				Entry{entryError, "test error 2", 2},
-				Entry{entryInfo, "test info 10", 10},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		r := Report{}
-		for _, f := range tt.fs {
-			f.fn(&r, f.line, f.message)
-		}
-		if es := r.Entries(); !reflect.DeepEqual(tt.es, es) {
-			t.Errorf("bad entries (%v): want %#v, got %#v", tt.fs, tt.es, es)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/validate/rules.go

@@ -1,180 +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 validate
-
-import (
-	"fmt"
-	"net/url"
-	"path"
-	"reflect"
-	"strings"
-
-	"github.com/coreos/coreos-cloudinit/config"
-)
-
-type rule func(config node, report *Report)
-
-// Rules contains all of the validation rules.
-var Rules []rule = []rule{
-	checkDiscoveryUrl,
-	checkEncoding,
-	checkStructure,
-	checkValidity,
-	checkWriteFiles,
-	checkWriteFilesUnderCoreos,
-}
-
-// checkDiscoveryUrl verifies that the string is a valid url.
-func checkDiscoveryUrl(cfg node, report *Report) {
-	c := cfg.Child("coreos").Child("etcd").Child("discovery")
-	if !c.IsValid() {
-		return
-	}
-
-	if _, err := url.ParseRequestURI(c.String()); err != nil {
-		report.Warning(c.line, "discovery URL is not valid")
-	}
-}
-
-// checkEncoding validates that, for each file under 'write_files', the
-// content can be decoded given the specified encoding.
-func checkEncoding(cfg node, report *Report) {
-	for _, f := range cfg.Child("write_files").children {
-		e := f.Child("encoding")
-		if !e.IsValid() {
-			continue
-		}
-
-		c := f.Child("content")
-		if _, err := config.DecodeContent(c.String(), e.String()); err != nil {
-			report.Error(c.line, fmt.Sprintf("content cannot be decoded as %q", e.String()))
-		}
-	}
-}
-
-// checkStructure compares the provided config to the empty config.CloudConfig
-// structure. Each node is checked to make sure that it exists in the known
-// structure and that its type is compatible.
-func checkStructure(cfg node, report *Report) {
-	g := NewNode(config.CloudConfig{}, NewContext([]byte{}))
-	checkNodeStructure(cfg, g, report)
-}
-
-func checkNodeStructure(n, g node, r *Report) {
-	if !isCompatible(n.Kind(), g.Kind()) {
-		r.Warning(n.line, fmt.Sprintf("incorrect type for %q (want %s)", n.name, g.HumanType()))
-		return
-	}
-
-	switch g.Kind() {
-	case reflect.Struct:
-		for _, cn := range n.children {
-			if cg := g.Child(cn.name); cg.IsValid() {
-				if msg := cg.field.Tag.Get("deprecated"); msg != "" {
-					r.Warning(cn.line, fmt.Sprintf("deprecated key %q (%s)", cn.name, msg))
-				}
-				checkNodeStructure(cn, cg, r)
-			} else {
-				r.Warning(cn.line, fmt.Sprintf("unrecognized key %q", cn.name))
-			}
-		}
-	case reflect.Slice:
-		for _, cn := range n.children {
-			var cg node
-			c := g.Type().Elem()
-			toNode(reflect.New(c).Elem().Interface(), context{}, &cg)
-			checkNodeStructure(cn, cg, r)
-		}
-	case reflect.String, reflect.Int, reflect.Float64, reflect.Bool:
-	default:
-		panic(fmt.Sprintf("checkNodeStructure(): unhandled kind %s", g.Kind()))
-	}
-}
-
-// isCompatible determines if the type of kind n can be converted to the type
-// of kind g in the context of YAML. This is not an exhaustive list, but its
-// enough for the purposes of cloud-config validation.
-func isCompatible(n, g reflect.Kind) bool {
-	switch g {
-	case reflect.String:
-		return n == reflect.String || n == reflect.Int || n == reflect.Float64 || n == reflect.Bool
-	case reflect.Struct:
-		return n == reflect.Struct || n == reflect.Map
-	case reflect.Float64:
-		return n == reflect.Float64 || n == reflect.Int
-	case reflect.Bool, reflect.Slice, reflect.Int:
-		return n == g
-	default:
-		panic(fmt.Sprintf("isCompatible(): unhandled kind %s", g))
-	}
-}
-
-// checkValidity checks the value of every node in the provided config by
-// running config.AssertValid() on it.
-func checkValidity(cfg node, report *Report) {
-	g := NewNode(config.CloudConfig{}, NewContext([]byte{}))
-	checkNodeValidity(cfg, g, report)
-}
-
-func checkNodeValidity(n, g node, r *Report) {
-	if err := config.AssertValid(n.Value, g.field.Tag.Get("valid")); err != nil {
-		r.Error(n.line, fmt.Sprintf("invalid value %v", n.Value.Interface()))
-	}
-	switch g.Kind() {
-	case reflect.Struct:
-		for _, cn := range n.children {
-			if cg := g.Child(cn.name); cg.IsValid() {
-				checkNodeValidity(cn, cg, r)
-			}
-		}
-	case reflect.Slice:
-		for _, cn := range n.children {
-			var cg node
-			c := g.Type().Elem()
-			toNode(reflect.New(c).Elem().Interface(), context{}, &cg)
-			checkNodeValidity(cn, cg, r)
-		}
-	case reflect.String, reflect.Int, reflect.Float64, reflect.Bool:
-	default:
-		panic(fmt.Sprintf("checkNodeValidity(): unhandled kind %s", g.Kind()))
-	}
-}
-
-// checkWriteFiles checks to make sure that the target file can actually be
-// written. Note that this check is approximate (it only checks to see if the file
-// is under /usr).
-func checkWriteFiles(cfg node, report *Report) {
-	for _, f := range cfg.Child("write_files").children {
-		c := f.Child("path")
-		if !c.IsValid() {
-			continue
-		}
-
-		d := path.Dir(c.String())
-		switch {
-		case strings.HasPrefix(d, "/usr"):
-			report.Error(c.line, "file cannot be written to a read-only filesystem")
-		}
-	}
-}
-
-// checkWriteFilesUnderCoreos checks to see if the 'write_files' node is a
-// child of 'coreos' (it shouldn't be).
-func checkWriteFilesUnderCoreos(cfg node, report *Report) {
-	c := cfg.Child("coreos").Child("write_files")
-	if c.IsValid() {
-		report.Info(c.line, "write_files doesn't belong under coreos")
-	}
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/validate/rules_test.go

@@ -1,408 +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 validate
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestCheckDiscoveryUrl(t *testing.T) {
-	tests := []struct {
-		config string
-
-		entries []Entry
-	}{
-		{},
-		{
-			config: "coreos:\n  etcd:\n    discovery: https://discovery.etcd.io/00000000000000000000000000000000",
-		},
-		{
-			config: "coreos:\n  etcd:\n    discovery: http://custom.domain/mytoken",
-		},
-		{
-			config:  "coreos:\n  etcd:\n    discovery: disco",
-			entries: []Entry{{entryWarning, "discovery URL is not valid", 3}},
-		},
-	}
-
-	for i, tt := range tests {
-		r := Report{}
-		n, err := parseCloudConfig([]byte(tt.config), &r)
-		if err != nil {
-			panic(err)
-		}
-		checkDiscoveryUrl(n, &r)
-
-		if e := r.Entries(); !reflect.DeepEqual(tt.entries, e) {
-			t.Errorf("bad report (%d, %q): want %#v, got %#v", i, tt.config, tt.entries, e)
-		}
-	}
-}
-
-func TestCheckEncoding(t *testing.T) {
-	tests := []struct {
-		config string
-
-		entries []Entry
-	}{
-		{},
-		{
-			config: "write_files:\n  - encoding: base64\n    content: aGVsbG8K",
-		},
-		{
-			config: "write_files:\n  - content: !!binary aGVsbG8K",
-		},
-		{
-			config:  "write_files:\n  - encoding: base64\n    content: !!binary aGVsbG8K",
-			entries: []Entry{{entryError, `content cannot be decoded as "base64"`, 3}},
-		},
-		{
-			config: "write_files:\n  - encoding: base64\n    content: !!binary YUdWc2JHOEsK",
-		},
-		{
-			config: "write_files:\n  - encoding: gzip\n    content: !!binary H4sIAOC3tVQAA8tIzcnJ5wIAIDA6NgYAAAA=",
-		},
-		{
-			config: "write_files:\n  - encoding: gzip+base64\n    content: H4sIAOC3tVQAA8tIzcnJ5wIAIDA6NgYAAAA=",
-		},
-		{
-			config:  "write_files:\n  - encoding: custom\n    content: hello",
-			entries: []Entry{{entryError, `content cannot be decoded as "custom"`, 3}},
-		},
-	}
-
-	for i, tt := range tests {
-		r := Report{}
-		n, err := parseCloudConfig([]byte(tt.config), &r)
-		if err != nil {
-			panic(err)
-		}
-		checkEncoding(n, &r)
-
-		if e := r.Entries(); !reflect.DeepEqual(tt.entries, e) {
-			t.Errorf("bad report (%d, %q): want %#v, got %#v", i, tt.config, tt.entries, e)
-		}
-	}
-}
-
-func TestCheckStructure(t *testing.T) {
-	tests := []struct {
-		config string
-
-		entries []Entry
-	}{
-		{},
-
-		// Test for unrecognized keys
-		{
-			config:  "test:",
-			entries: []Entry{{entryWarning, "unrecognized key \"test\"", 1}},
-		},
-		{
-			config:  "coreos:\n  etcd:\n    bad:",
-			entries: []Entry{{entryWarning, "unrecognized key \"bad\"", 3}},
-		},
-		{
-			config: "coreos:\n  etcd:\n    discovery: good",
-		},
-
-		// Test for deprecated keys
-		{
-			config: "coreos:\n  etcd:\n    addr: hi",
-		},
-		{
-			config:  "coreos:\n  etcd:\n    proxy: hi",
-			entries: []Entry{{entryWarning, "deprecated key \"proxy\" (etcd2 options no longer work for etcd)", 3}},
-		},
-
-		// Test for error on list of nodes
-		{
-			config: "coreos:\n  units:\n    - hello\n    - goodbye",
-			entries: []Entry{
-				{entryWarning, "incorrect type for \"units[0]\" (want struct)", 3},
-				{entryWarning, "incorrect type for \"units[1]\" (want struct)", 4},
-			},
-		},
-
-		// Test for incorrect types
-		// Want boolean
-		{
-			config: "coreos:\n  units:\n    - enable: true",
-		},
-		{
-			config:  "coreos:\n  units:\n    - enable: 4",
-			entries: []Entry{{entryWarning, "incorrect type for \"enable\" (want bool)", 3}},
-		},
-		{
-			config:  "coreos:\n  units:\n    - enable: bad",
-			entries: []Entry{{entryWarning, "incorrect type for \"enable\" (want bool)", 3}},
-		},
-		{
-			config:  "coreos:\n  units:\n    - enable:\n        bad:",
-			entries: []Entry{{entryWarning, "incorrect type for \"enable\" (want bool)", 3}},
-		},
-		{
-			config:  "coreos:\n  units:\n    - enable:\n      - bad",
-			entries: []Entry{{entryWarning, "incorrect type for \"enable\" (want bool)", 3}},
-		},
-		// Want string
-		{
-			config: "hostname: true",
-		},
-		{
-			config: "hostname: 4",
-		},
-		{
-			config: "hostname: host",
-		},
-		{
-			config:  "hostname:\n  name:",
-			entries: []Entry{{entryWarning, "incorrect type for \"hostname\" (want string)", 1}},
-		},
-		{
-			config:  "hostname:\n  - name",
-			entries: []Entry{{entryWarning, "incorrect type for \"hostname\" (want string)", 1}},
-		},
-		// Want struct
-		{
-			config:  "coreos: true",
-			entries: []Entry{{entryWarning, "incorrect type for \"coreos\" (want struct)", 1}},
-		},
-		{
-			config:  "coreos: 4",
-			entries: []Entry{{entryWarning, "incorrect type for \"coreos\" (want struct)", 1}},
-		},
-		{
-			config:  "coreos: hello",
-			entries: []Entry{{entryWarning, "incorrect type for \"coreos\" (want struct)", 1}},
-		},
-		{
-			config: "coreos:\n  etcd:\n    discovery: fire in the disco",
-		},
-		{
-			config:  "coreos:\n  - hello",
-			entries: []Entry{{entryWarning, "incorrect type for \"coreos\" (want struct)", 1}},
-		},
-		// Want []string
-		{
-			config:  "ssh_authorized_keys: true",
-			entries: []Entry{{entryWarning, "incorrect type for \"ssh_authorized_keys\" (want []string)", 1}},
-		},
-		{
-			config:  "ssh_authorized_keys: 4",
-			entries: []Entry{{entryWarning, "incorrect type for \"ssh_authorized_keys\" (want []string)", 1}},
-		},
-		{
-			config:  "ssh_authorized_keys: key",
-			entries: []Entry{{entryWarning, "incorrect type for \"ssh_authorized_keys\" (want []string)", 1}},
-		},
-		{
-			config:  "ssh_authorized_keys:\n  key: value",
-			entries: []Entry{{entryWarning, "incorrect type for \"ssh_authorized_keys\" (want []string)", 1}},
-		},
-		{
-			config: "ssh_authorized_keys:\n  - key",
-		},
-		{
-			config:  "ssh_authorized_keys:\n  - key: value",
-			entries: []Entry{{entryWarning, "incorrect type for \"ssh_authorized_keys[0]\" (want string)", 2}},
-		},
-		// Want []struct
-		{
-			config:  "users:\n  true",
-			entries: []Entry{{entryWarning, "incorrect type for \"users\" (want []struct)", 1}},
-		},
-		{
-			config:  "users:\n  4",
-			entries: []Entry{{entryWarning, "incorrect type for \"users\" (want []struct)", 1}},
-		},
-		{
-			config:  "users:\n  bad",
-			entries: []Entry{{entryWarning, "incorrect type for \"users\" (want []struct)", 1}},
-		},
-		{
-			config:  "users:\n  bad:",
-			entries: []Entry{{entryWarning, "incorrect type for \"users\" (want []struct)", 1}},
-		},
-		{
-			config: "users:\n  - name: good",
-		},
-		// Want struct within array
-		{
-			config:  "users:\n  - true",
-			entries: []Entry{{entryWarning, "incorrect type for \"users[0]\" (want struct)", 2}},
-		},
-		{
-			config:  "users:\n  - name: hi\n  - true",
-			entries: []Entry{{entryWarning, "incorrect type for \"users[1]\" (want struct)", 3}},
-		},
-		{
-			config:  "users:\n  - 4",
-			entries: []Entry{{entryWarning, "incorrect type for \"users[0]\" (want struct)", 2}},
-		},
-		{
-			config:  "users:\n  - bad",
-			entries: []Entry{{entryWarning, "incorrect type for \"users[0]\" (want struct)", 2}},
-		},
-		{
-			config:  "users:\n  - - bad",
-			entries: []Entry{{entryWarning, "incorrect type for \"users[0]\" (want struct)", 2}},
-		},
-	}
-
-	for i, tt := range tests {
-		r := Report{}
-		n, err := parseCloudConfig([]byte(tt.config), &r)
-		if err != nil {
-			panic(err)
-		}
-		checkStructure(n, &r)
-
-		if e := r.Entries(); !reflect.DeepEqual(tt.entries, e) {
-			t.Errorf("bad report (%d, %q): want %#v, got %#v", i, tt.config, tt.entries, e)
-		}
-	}
-}
-
-func TestCheckValidity(t *testing.T) {
-	tests := []struct {
-		config string
-
-		entries []Entry
-	}{
-		// string
-		{
-			config: "hostname: test",
-		},
-
-		// int
-		{
-			config: "coreos:\n  fleet:\n    verbosity: 2",
-		},
-
-		// bool
-		{
-			config: "coreos:\n  units:\n    - enable: true",
-		},
-
-		// slice
-		{
-			config: "coreos:\n  units:\n    - command: start\n    - name: stop",
-		},
-		{
-			config:  "coreos:\n  units:\n    - command: lol",
-			entries: []Entry{{entryError, "invalid value lol", 3}},
-		},
-
-		// struct
-		{
-			config: "coreos:\n  update:\n    reboot_strategy: off",
-		},
-		{
-			config:  "coreos:\n  update:\n    reboot_strategy: always",
-			entries: []Entry{{entryError, "invalid value always", 3}},
-		},
-
-		// unknown
-		{
-			config: "unknown: hi",
-		},
-	}
-
-	for i, tt := range tests {
-		r := Report{}
-		n, err := parseCloudConfig([]byte(tt.config), &r)
-		if err != nil {
-			panic(err)
-		}
-		checkValidity(n, &r)
-
-		if e := r.Entries(); !reflect.DeepEqual(tt.entries, e) {
-			t.Errorf("bad report (%d, %q): want %#v, got %#v", i, tt.config, tt.entries, e)
-		}
-	}
-}
-
-func TestCheckWriteFiles(t *testing.T) {
-	tests := []struct {
-		config string
-
-		entries []Entry
-	}{
-		{},
-		{
-			config: "write_files:\n  - path: /valid",
-		},
-		{
-			config: "write_files:\n  - path: /tmp/usr/valid",
-		},
-		{
-			config:  "write_files:\n  - path: /usr/invalid",
-			entries: []Entry{{entryError, "file cannot be written to a read-only filesystem", 2}},
-		},
-		{
-			config:  "write-files:\n  - path: /tmp/../usr/invalid",
-			entries: []Entry{{entryError, "file cannot be written to a read-only filesystem", 2}},
-		},
-	}
-
-	for i, tt := range tests {
-		r := Report{}
-		n, err := parseCloudConfig([]byte(tt.config), &r)
-		if err != nil {
-			panic(err)
-		}
-		checkWriteFiles(n, &r)
-
-		if e := r.Entries(); !reflect.DeepEqual(tt.entries, e) {
-			t.Errorf("bad report (%d, %q): want %#v, got %#v", i, tt.config, tt.entries, e)
-		}
-	}
-}
-
-func TestCheckWriteFilesUnderCoreos(t *testing.T) {
-	tests := []struct {
-		config string
-
-		entries []Entry
-	}{
-		{},
-		{
-			config: "write_files:\n  - path: /hi",
-		},
-		{
-			config:  "coreos:\n  write_files:\n    - path: /hi",
-			entries: []Entry{{entryInfo, "write_files doesn't belong under coreos", 2}},
-		},
-		{
-			config:  "coreos:\n  write-files:\n    - path: /hyphen",
-			entries: []Entry{{entryInfo, "write_files doesn't belong under coreos", 2}},
-		},
-	}
-
-	for i, tt := range tests {
-		r := Report{}
-		n, err := parseCloudConfig([]byte(tt.config), &r)
-		if err != nil {
-			panic(err)
-		}
-		checkWriteFilesUnderCoreos(n, &r)
-
-		if e := r.Entries(); !reflect.DeepEqual(tt.entries, e) {
-			t.Errorf("bad report (%d, %q): want %#v, got %#v", i, tt.config, tt.entries, e)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/validate/validate.go

@@ -1,164 +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 validate
-
-import (
-	"errors"
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/coreos/coreos-cloudinit/config"
-
-	"github.com/coreos/yaml"
-)
-
-var (
-	yamlLineError = regexp.MustCompile(`^YAML error: line (?P<line>[[:digit:]]+): (?P<msg>.*)$`)
-	yamlError     = regexp.MustCompile(`^YAML error: (?P<msg>.*)$`)
-)
-
-// Validate runs a series of validation tests against the given userdata and
-// returns a report detailing all of the issues. Presently, only cloud-configs
-// can be validated.
-func Validate(userdataBytes []byte) (Report, error) {
-	switch {
-	case len(userdataBytes) == 0:
-		return Report{}, nil
-	case config.IsScript(string(userdataBytes)):
-		return Report{}, nil
-	case config.IsIgnitionConfig(string(userdataBytes)):
-		return Report{}, nil
-	case config.IsCloudConfig(string(userdataBytes)):
-		return validateCloudConfig(userdataBytes, Rules)
-	default:
-		return Report{entries: []Entry{
-			Entry{kind: entryError, message: `must be "#cloud-config" or begin with "#!"`, line: 1},
-		}}, nil
-	}
-}
-
-// validateCloudConfig runs all of the validation rules in Rules and returns
-// the resulting report and any errors encountered.
-func validateCloudConfig(config []byte, rules []rule) (report Report, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			err = fmt.Errorf("%v", r)
-		}
-	}()
-
-	c, err := parseCloudConfig(config, &report)
-	if err != nil {
-		return report, err
-	}
-
-	for _, r := range rules {
-		r(c, &report)
-	}
-	return report, nil
-}
-
-// parseCloudConfig parses the provided config into a node structure and logs
-// any parsing issues into the provided report. Unrecoverable errors are
-// returned as an error.
-func parseCloudConfig(cfg []byte, report *Report) (node, error) {
-	yaml.UnmarshalMappingKeyTransform = func(nameIn string) (nameOut string) {
-		return nameIn
-	}
-	// unmarshal the config into an implicitly-typed form. The yaml library
-	// will implicitly convert types into their normalized form
-	// (e.g. 0744 -> 484, off -> false).
-	var weak map[interface{}]interface{}
-	if err := yaml.Unmarshal(cfg, &weak); err != nil {
-		matches := yamlLineError.FindStringSubmatch(err.Error())
-		if len(matches) == 3 {
-			line, err := strconv.Atoi(matches[1])
-			if err != nil {
-				return node{}, err
-			}
-			msg := matches[2]
-			report.Error(line, msg)
-			return node{}, nil
-		}
-
-		matches = yamlError.FindStringSubmatch(err.Error())
-		if len(matches) == 2 {
-			report.Error(1, matches[1])
-			return node{}, nil
-		}
-
-		return node{}, errors.New("couldn't parse yaml error")
-	}
-	w := NewNode(weak, NewContext(cfg))
-	w = normalizeNodeNames(w, report)
-
-	// unmarshal the config into the explicitly-typed form.
-	yaml.UnmarshalMappingKeyTransform = func(nameIn string) (nameOut string) {
-		return strings.Replace(nameIn, "-", "_", -1)
-	}
-	var strong config.CloudConfig
-	if err := yaml.Unmarshal([]byte(cfg), &strong); err != nil {
-		return node{}, err
-	}
-	s := NewNode(strong, NewContext(cfg))
-
-	// coerceNodes weak nodes and strong nodes. strong nodes replace weak nodes
-	// if they are compatible types (this happens when the yaml library
-	// converts the input).
-	// (e.g. weak 484 is replaced by strong 0744, weak 4 is not replaced by
-	// strong false)
-	return coerceNodes(w, s), nil
-}
-
-// coerceNodes recursively evaluates two nodes, returning a new node containing
-// either the weak or strong node's value and its recursively processed
-// children. The strong node's value is used if the two nodes are leafs, are
-// both valid, and are compatible types (defined by isCompatible()). The weak
-// node is returned in all other cases. coerceNodes is used to counteract the
-// effects of yaml's automatic type conversion. The weak node is the one
-// resulting from unmarshalling into an empty interface{} (the type is
-// inferred). The strong node is the one resulting from unmarshalling into a
-// struct. If the two nodes are of compatible types, the yaml library correctly
-// parsed the value into the strongly typed unmarshalling. In this case, we
-// prefer the strong node because its actually the type we are expecting.
-func coerceNodes(w, s node) node {
-	n := w
-	n.children = nil
-	if len(w.children) == 0 && len(s.children) == 0 &&
-		w.IsValid() && s.IsValid() &&
-		isCompatible(w.Kind(), s.Kind()) {
-		n.Value = s.Value
-	}
-
-	for _, cw := range w.children {
-		n.children = append(n.children, coerceNodes(cw, s.Child(cw.name)))
-	}
-	return n
-}
-
-// normalizeNodeNames replaces all occurences of '-' with '_' within key names
-// and makes a note of each replacement in the report.
-func normalizeNodeNames(node node, report *Report) node {
-	if strings.Contains(node.name, "-") {
-		// TODO(crawford): Enable this message once the new validator hits stable.
-		//report.Info(node.line, fmt.Sprintf("%q uses '-' instead of '_'", node.name))
-		node.name = strings.Replace(node.name, "-", "_", -1)
-	}
-	for i := range node.children {
-		node.children[i] = normalizeNodeNames(node.children[i], report)
-	}
-	return node
-}

Godeps/_workspace/src/github.com/coreos/coreos-cloudinit/config/validate/validate_test.go

@@ -1,177 +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 validate
-
-import (
-	"errors"
-	"reflect"
-	"testing"
-)
-
-func TestParseCloudConfig(t *testing.T) {
-	tests := []struct {
-		config string
-
-		entries []Entry
-	}{
-		{},
-		{
-			config: "	",
-			entries: []Entry{{entryError, "found character that cannot start any token", 1}},
-		},
-		{
-			config:  "a:\na",
-			entries: []Entry{{entryError, "could not find expected ':'", 2}},
-		},
-		{
-			config:  "#hello\na:\na",
-			entries: []Entry{{entryError, "could not find expected ':'", 3}},
-		},
-	}
-
-	for _, tt := range tests {
-		r := Report{}
-		parseCloudConfig([]byte(tt.config), &r)
-
-		if e := r.Entries(); !reflect.DeepEqual(tt.entries, e) {
-			t.Errorf("bad report (%s): want %#v, got %#v", tt.config, tt.entries, e)
-		}
-	}
-}
-
-func TestValidateCloudConfig(t *testing.T) {
-	tests := []struct {
-		config string
-		rules  []rule
-
-		report Report
-		err    error
-	}{
-		{
-			rules: []rule{func(_ node, _ *Report) { panic("something happened") }},
-			err:   errors.New("something happened"),
-		},
-		{
-			config: "write_files:\n  - permissions: 0744",
-			rules:  Rules,
-		},
-		{
-			config: "write_files:\n  - permissions: '0744'",
-			rules:  Rules,
-		},
-		{
-			config: "write_files:\n  - permissions: 744",
-			rules:  Rules,
-		},
-		{
-			config: "write_files:\n  - permissions: '744'",
-			rules:  Rules,
-		},
-		{
-			config: "coreos:\n  update:\n    reboot-strategy: off",
-			rules:  Rules,
-		},
-		{
-			config: "coreos:\n  update:\n    reboot-strategy: false",
-			rules:  Rules,
-			report: Report{entries: []Entry{{entryError, "invalid value false", 3}}},
-		},
-	}
-
-	for _, tt := range tests {
-		r, err := validateCloudConfig([]byte(tt.config), tt.rules)
-		if !reflect.DeepEqual(tt.err, err) {
-			t.Errorf("bad error (%s): want %v, got %v", tt.config, tt.err, err)
-		}
-		if !reflect.DeepEqual(tt.report, r) {
-			t.Errorf("bad report (%s): want %+v, got %+v", tt.config, tt.report, r)
-		}
-	}
-}
-
-func TestValidate(t *testing.T) {
-	tests := []struct {
-		config string
-
-		report Report
-	}{
-		{},
-		{
-			config: "#!/bin/bash\necho hey",
-		},
-		{
-			config: "{}",
-			report: Report{entries: []Entry{{entryError, `must be "#cloud-config" or begin with "#!"`, 1}}},
-		},
-		{
-			config: `{"ignitionVersion":0}`,
-		},
-		{
-			config: `{"ignitionVersion":1}`,
-		},
-	}
-
-	for i, tt := range tests {
-		r, err := Validate([]byte(tt.config))
-		if err != nil {
-			t.Errorf("bad error (case #%d): want %v, got %v", i, nil, err)
-		}
-		if !reflect.DeepEqual(tt.report, r) {
-			t.Errorf("bad report (case #%d): want %+v, got %+v", i, tt.report, r)
-		}
-	}
-}
-
-func BenchmarkValidate(b *testing.B) {
-	config := `#cloud-config
-hostname: test
-
-coreos:
-  etcd:
-    name:      node001
-    discovery: https://discovery.etcd.io/disco
-    addr:      $public_ipv4:4001
-    peer-addr: $private_ipv4:7001
-  fleet:
-    verbosity: 2
-    metadata:  "hi"
-  update:
-    reboot-strategy: off
-  units:
-    - name:    hi.service
-      command: start
-      enable:  true
-    - name:    bye.service
-      command: stop
-
-ssh_authorized_keys:
-  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0g+ZTxC7weoIJLUafOgrm+h...
-  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0g+ZTxC7weoIJLUafOgrm+h...
-
-users:
-  - name: me
-
-write_files:
-  - path: /etc/yes
-    content: "Hi"
-
-manage_etc_hosts: localhost`
-
-	for i := 0; i < b.N; i++ {
-		if _, err := Validate([]byte(config)); err != nil {
-			panic(err)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/go-systemd/journal/journal.go

@@ -1,178 +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 journal provides write bindings to the local systemd journal.
-// It is implemented in pure Go and connects to the journal directly over its
-// unix socket.
-//
-// To read from the journal, see the "sdjournal" package, which wraps the
-// sd-journal a C API.
-//
-// http://www.freedesktop.org/software/systemd/man/systemd-journald.service.html
-package journal
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"syscall"
-)
-
-// Priority of a journal message
-type Priority int
-
-const (
-	PriEmerg Priority = iota
-	PriAlert
-	PriCrit
-	PriErr
-	PriWarning
-	PriNotice
-	PriInfo
-	PriDebug
-)
-
-var conn net.Conn
-
-func init() {
-	var err error
-	conn, err = net.Dial("unixgram", "/run/systemd/journal/socket")
-	if err != nil {
-		conn = nil
-	}
-}
-
-// Enabled returns true if the local systemd journal is available for logging
-func Enabled() bool {
-	return conn != nil
-}
-
-// Send a message to the local systemd journal. vars is a map of journald
-// fields to values.  Fields must be composed of uppercase letters, numbers,
-// and underscores, but must not start with an underscore. Within these
-// restrictions, any arbitrary field name may be used.  Some names have special
-// significance: see the journalctl documentation
-// (http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html)
-// for more details.  vars may be nil.
-func Send(message string, priority Priority, vars map[string]string) error {
-	if conn == nil {
-		return journalError("could not connect to journald socket")
-	}
-
-	data := new(bytes.Buffer)
-	appendVariable(data, "PRIORITY", strconv.Itoa(int(priority)))
-	appendVariable(data, "MESSAGE", message)
-	for k, v := range vars {
-		appendVariable(data, k, v)
-	}
-
-	_, err := io.Copy(conn, data)
-	if err != nil && isSocketSpaceError(err) {
-		file, err := tempFd()
-		if err != nil {
-			return journalError(err.Error())
-		}
-		_, err = io.Copy(file, data)
-		if err != nil {
-			return journalError(err.Error())
-		}
-
-		rights := syscall.UnixRights(int(file.Fd()))
-
-		/* this connection should always be a UnixConn, but better safe than sorry */
-		unixConn, ok := conn.(*net.UnixConn)
-		if !ok {
-			return journalError("can't send file through non-Unix connection")
-		}
-		unixConn.WriteMsgUnix([]byte{}, rights, nil)
-	} else if err != nil {
-		return journalError(err.Error())
-	}
-	return nil
-}
-
-// Print prints a message to the local systemd journal using Send().
-func Print(priority Priority, format string, a ...interface{}) error {
-	return Send(fmt.Sprintf(format, a...), priority, nil)
-}
-
-func appendVariable(w io.Writer, name, value string) {
-	if !validVarName(name) {
-		journalError("variable name contains invalid character, ignoring")
-	}
-	if strings.ContainsRune(value, '\n') {
-		/* When the value contains a newline, we write:
-		 * - the variable name, followed by a newline
-		 * - the size (in 64bit little endian format)
-		 * - the data, followed by a newline
-		 */
-		fmt.Fprintln(w, name)
-		binary.Write(w, binary.LittleEndian, uint64(len(value)))
-		fmt.Fprintln(w, value)
-	} else {
-		/* just write the variable and value all on one line */
-		fmt.Fprintf(w, "%s=%s\n", name, value)
-	}
-}
-
-func validVarName(name string) bool {
-	/* The variable name must be in uppercase and consist only of characters,
-	 * numbers and underscores, and may not begin with an underscore. (from the docs)
-	 */
-
-	valid := name[0] != '_'
-	for _, c := range name {
-		valid = valid && ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9') || c == '_'
-	}
-	return valid
-}
-
-func isSocketSpaceError(err error) bool {
-	opErr, ok := err.(*net.OpError)
-	if !ok {
-		return false
-	}
-
-	sysErr, ok := opErr.Err.(syscall.Errno)
-	if !ok {
-		return false
-	}
-
-	return sysErr == syscall.EMSGSIZE || sysErr == syscall.ENOBUFS
-}
-
-func tempFd() (*os.File, error) {
-	file, err := ioutil.TempFile("/dev/shm/", "journal.XXXXX")
-	if err != nil {
-		return nil, err
-	}
-	syscall.Unlink(file.Name())
-	if err != nil {
-		return nil, err
-	}
-	return file, nil
-}
-
-func journalError(s string) error {
-	s = "journal error: " + s
-	fmt.Fprintln(os.Stderr, s)
-	return errors.New(s)
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/cloudinit.go

@@ -1,36 +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.
-
-// These functions are copied from github.com/coreos/coreos-cloudinit/config.
-
-package config
-
-import (
-	"strings"
-	"unicode"
-)
-
-func isCloudConfig(userdata []byte) bool {
-	header := strings.SplitN(string(userdata), "\n", 2)[0]
-
-	// Trim trailing whitespaces
-	header = strings.TrimRightFunc(header, unicode.IsSpace)
-
-	return (header == "#cloud-config")
-}
-
-func isScript(userdata []byte) bool {
-	header := strings.SplitN(string(userdata), "\n", 2)[0]
-	return strings.HasPrefix(header, "#!")
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/config.go

@@ -1,83 +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 config
-
-import (
-	"bytes"
-	"compress/gzip"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-
-	"github.com/coreos/ignition/third_party/github.com/camlistore/camlistore/pkg/errorutil"
-)
-
-type Config struct {
-	Version  int      `json:"ignitionVersion"    yaml:"ignition_version"`
-	Storage  Storage  `json:"storage,omitempty"  yaml:"storage"`
-	Systemd  Systemd  `json:"systemd,omitempty"  yaml:"systemd"`
-	Networkd Networkd `json:"networkd,omitempty" yaml:"networkd"`
-	Passwd   Passwd   `json:"passwd,omitempty"   yaml:"passwd"`
-}
-
-const (
-	Version = 1
-)
-
-var (
-	ErrVersion     = errors.New("incorrect config version")
-	ErrCloudConfig = errors.New("not a config (found coreos-cloudconfig)")
-	ErrScript      = errors.New("not a config (found coreos-cloudinit script)")
-	ErrEmpty       = errors.New("not a config (empty)")
-)
-
-func Parse(config []byte) (cfg Config, err error) {
-	if err = json.Unmarshal(config, &cfg); err == nil {
-		if cfg.Version != Version {
-			err = ErrVersion
-		}
-	} else if isCloudConfig(decompressIfGzipped(config)) {
-		err = ErrCloudConfig
-	} else if isScript(decompressIfGzipped(config)) {
-		err = ErrScript
-	} else if isEmpty(config) {
-		err = ErrEmpty
-	}
-	if serr, ok := err.(*json.SyntaxError); ok {
-		line, col, highlight := errorutil.HighlightBytePosition(bytes.NewReader(config), serr.Offset)
-		err = fmt.Errorf("error at line %d, column %d\n%s%v", line, col, highlight, err)
-	}
-
-	return
-}
-
-func isEmpty(userdata []byte) bool {
-	return len(userdata) == 0
-}
-
-func decompressIfGzipped(data []byte) []byte {
-	if reader, err := gzip.NewReader(bytes.NewReader(data)); err == nil {
-		uncompressedData, err := ioutil.ReadAll(reader)
-		reader.Close()
-		if err == nil {
-			return uncompressedData
-		} else {
-			return data
-		}
-	} else {
-		return data
-	}
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/config_test.go

@@ -1,87 +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 config
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestParse(t *testing.T) {
-	type in struct {
-		config []byte
-	}
-	type out struct {
-		config Config
-		err    error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{config: []byte(`{"ignitionVersion": 1}`)},
-			out: out{config: Config{Version: 1}},
-		},
-		{
-			in:  in{config: []byte(`{}`)},
-			out: out{err: ErrVersion},
-		},
-		{
-			in:  in{config: []byte{}},
-			out: out{err: ErrEmpty},
-		},
-		{
-			in:  in{config: []byte("#cloud-config")},
-			out: out{err: ErrCloudConfig},
-		},
-		{
-			in:  in{config: []byte("#cloud-config ")},
-			out: out{err: ErrCloudConfig},
-		},
-		{
-			in:  in{config: []byte("#cloud-config\n\r")},
-			out: out{err: ErrCloudConfig},
-		},
-		{
-			in: in{config: []byte{0x1f, 0x8b, 0x08, 0x00, 0x03, 0xd6, 0x79, 0x56,
-				0x00, 0x03, 0x53, 0x4e, 0xce, 0xc9, 0x2f, 0x4d, 0xd1, 0x4d, 0xce,
-				0xcf, 0x4b, 0xcb, 0x4c, 0xe7, 0x02, 0x00, 0x05, 0x56, 0xb3, 0xb8,
-				0x0e, 0x00, 0x00, 0x00}},
-			out: out{err: ErrCloudConfig},
-		},
-		{
-			in:  in{config: []byte("#!/bin/sh")},
-			out: out{err: ErrScript},
-		},
-		{
-			in: in{config: []byte{0x1f, 0x8b, 0x08, 0x00, 0x48, 0xda, 0x79, 0x56,
-				0x00, 0x03, 0x53, 0x56, 0xd4, 0x4f, 0xca, 0xcc, 0xd3, 0x2f, 0xce,
-				0xe0, 0x02, 0x00, 0x1d, 0x9d, 0xfb, 0x04, 0x0a, 0x00, 0x00, 0x00}},
-			out: out{err: ErrScript},
-		},
-	}
-
-	for i, test := range tests {
-		config, err := Parse(test.in.config)
-		if !reflect.DeepEqual(test.out.config, config) {
-			t.Errorf("#%d: bad config: want %+v, got %+v", i, test.out.config, config)
-		}
-		if test.out.err != err {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/devicepath.go

@@ -1,50 +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 config
-
-import (
-	"encoding/json"
-	"path/filepath"
-)
-
-type DevicePath string
-
-func (d *DevicePath) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return d.unmarshal(unmarshal)
-}
-
-func (d *DevicePath) UnmarshalJSON(data []byte) error {
-	return d.unmarshal(func(td interface{}) error {
-		return json.Unmarshal(data, td)
-	})
-}
-
-type devicePath DevicePath
-
-func (d *DevicePath) unmarshal(unmarshal func(interface{}) error) error {
-	td := devicePath(*d)
-	if err := unmarshal(&td); err != nil {
-		return err
-	}
-	*d = DevicePath(td)
-	return d.assertValid()
-}
-
-func (d DevicePath) assertValid() error {
-	if !filepath.IsAbs(string(d)) {
-		return ErrFilesystemRelativePath
-	}
-	return nil
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/disk.go

@@ -1,167 +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 config
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-type Disk struct {
-	Device     DevicePath  `json:"device,omitempty"     yaml:"device"`
-	WipeTable  bool        `json:"wipeTable,omitempty"  yaml:"wipe_table"`
-	Partitions []Partition `json:"partitions,omitempty" yaml:"partitions"`
-}
-
-func (n *Disk) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	if err := n.unmarshal(unmarshal); err != nil {
-		return err
-	}
-	if err := n.preparePartitions(); err != nil {
-		return err
-	}
-	return n.assertValid()
-}
-
-func (n *Disk) UnmarshalJSON(data []byte) error {
-	err := n.unmarshal(func(tn interface{}) error {
-		return json.Unmarshal(data, tn)
-	})
-	if err != nil {
-		return err
-	}
-	return n.assertValid()
-}
-
-type disk Disk
-
-func (n *Disk) unmarshal(unmarshal func(interface{}) error) error {
-	tn := disk(*n)
-	if err := unmarshal(&tn); err != nil {
-		return err
-	}
-	*n = Disk(tn)
-	return nil
-}
-
-func (n Disk) assertValid() error {
-	// This applies to YAML (post-prepare) and JSON unmarshals equally:
-	if len(n.Device) == 0 {
-		return fmt.Errorf("disk device is required")
-	}
-	if n.partitionNumbersCollide() {
-		return fmt.Errorf("disk %q: partition numbers collide", n.Device)
-	}
-	if n.partitionsOverlap() {
-		return fmt.Errorf("disk %q: partitions overlap", n.Device)
-	}
-	if n.partitionsMisaligned() {
-		return fmt.Errorf("disk %q: partitions misaligned", n.Device)
-	}
-	// Disks which get to this point will likely succeed in sgdisk
-	return nil
-}
-
-// partitionNumbersCollide returns true if partition numbers in n.Partitions are not unique.
-func (n Disk) partitionNumbersCollide() bool {
-	m := map[int][]Partition{}
-	for _, p := range n.Partitions {
-		m[p.Number] = append(m[p.Number], p)
-	}
-	for _, n := range m {
-		if len(n) > 1 {
-			// TODO(vc): return information describing the collision for logging
-			return true
-		}
-	}
-	return false
-}
-
-// end returns the last sector of a partition.
-func (p Partition) end() PartitionDimension {
-	if p.Size == 0 {
-		// a size of 0 means "fill available", just return the start as the end for those.
-		return p.Start
-	}
-	return p.Start + p.Size - 1
-}
-
-// partitionsOverlap returns true if any explicitly dimensioned partitions overlap
-func (n Disk) partitionsOverlap() bool {
-	for _, p := range n.Partitions {
-		// Starts of 0 are placed by sgdisk into the "largest available block" at that time.
-		// We aren't going to check those for overlap since we don't have the disk geometry.
-		if p.Start == 0 {
-			continue
-		}
-
-		for _, o := range n.Partitions {
-			if p == o || o.Start == 0 {
-				continue
-			}
-
-			// is p.Start within o?
-			if p.Start >= o.Start && p.Start <= o.end() {
-				return true
-			}
-
-			// is p.end() within o?
-			if p.end() >= o.Start && p.end() <= o.end() {
-				return true
-			}
-
-			// do p.Start and p.end() straddle o?
-			if p.Start < o.Start && p.end() > o.end() {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-// partitionsMisaligned returns true if any of the partitions don't start on a 2048-sector (1MiB) boundary.
-func (n Disk) partitionsMisaligned() bool {
-	for _, p := range n.Partitions {
-		if (p.Start & (2048 - 1)) != 0 {
-			return true
-		}
-	}
-	return false
-}
-
-// preparePartitions performs some checks and potentially adjusts the partitions for alignment.
-// This is only invoked when unmarshalling YAML, since there we parse human-friendly units.
-func (n *Disk) preparePartitions() error {
-	// On the YAML side we accept human-friendly units which may require massaging.
-
-	// align partition starts
-	for i := range n.Partitions {
-		// skip automatically placed partitions
-		if n.Partitions[i].Start == 0 {
-			continue
-		}
-
-		// keep partitions out of the first 2048 sectors
-		if n.Partitions[i].Start < 2048 {
-			n.Partitions[i].Start = 2048
-		}
-
-		// toss the bottom 11 bits
-		n.Partitions[i].Start &= ^PartitionDimension(2048 - 1)
-	}
-
-	// TODO(vc): may be interesting to do something about potentially overlapping partitions
-	return nil
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/file.go

@@ -1,63 +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 config
-
-import (
-	"encoding/json"
-	"errors"
-	"os"
-)
-
-var (
-	ErrFileIllegalMode = errors.New("illegal file mode")
-)
-
-type FileMode os.FileMode
-
-type File struct {
-	Path     string   `json:"path,omitempty"     yaml:"path"`
-	Contents string   `json:"contents,omitempty" yaml:"contents"`
-	Mode     FileMode `json:"mode,omitempty"     yaml:"mode"`
-	Uid      int      `json:"uid,omitempty"      yaml:"uid"`
-	Gid      int      `json:"gid,omitempty"      yaml:"gid"`
-}
-
-func (m *FileMode) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return m.unmarshal(unmarshal)
-}
-
-func (m *FileMode) UnmarshalJSON(data []byte) error {
-	return m.unmarshal(func(tm interface{}) error {
-		return json.Unmarshal(data, tm)
-	})
-}
-
-type fileMode FileMode
-
-func (m *FileMode) unmarshal(unmarshal func(interface{}) error) error {
-	tm := fileMode(*m)
-	if err := unmarshal(&tm); err != nil {
-		return err
-	}
-	*m = FileMode(tm)
-	return m.assertValid()
-}
-
-func (m FileMode) assertValid() error {
-	if (m &^ 07777) != 0 {
-		return ErrFileIllegalMode
-	}
-	return nil
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/file_test.go

@@ -1,139 +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 config
-
-import (
-	"encoding/json"
-	"reflect"
-	"testing"
-
-	"github.com/coreos/ignition/third_party/github.com/go-yaml/yaml"
-)
-
-func TestFileModeUnmarshalJSON(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		mode FileMode
-		err  error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `420`},
-			out: out{mode: FileMode(420)},
-		},
-		{
-			in:  in{data: `9999`},
-			out: out{mode: FileMode(9999), err: ErrFileIllegalMode},
-		},
-	}
-
-	for i, test := range tests {
-		var mode FileMode
-		err := json.Unmarshal([]byte(test.in.data), &mode)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if !reflect.DeepEqual(test.out.mode, mode) {
-			t.Errorf("#%d: bad mode: want %#o, got %#o", i, test.out.mode, mode)
-		}
-	}
-}
-
-func TestFileModeUnmarshalYAML(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		mode FileMode
-		err  error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `0644`},
-			out: out{mode: FileMode(0644)},
-		},
-		{
-			in:  in{data: `0420`},
-			out: out{mode: FileMode(0420)},
-		},
-		{
-			in:  in{data: `017777`},
-			out: out{mode: FileMode(017777), err: ErrFileIllegalMode},
-		},
-	}
-
-	for i, test := range tests {
-		var mode FileMode
-		err := yaml.Unmarshal([]byte(test.in.data), &mode)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if !reflect.DeepEqual(test.out.mode, mode) {
-			t.Errorf("#%d: bad mode: want %#o, got %#o", i, test.out.mode, mode)
-		}
-	}
-}
-
-func TestFileAssertValid(t *testing.T) {
-	type in struct {
-		mode FileMode
-	}
-	type out struct {
-		err error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{mode: FileMode(0)},
-			out: out{},
-		},
-		{
-			in:  in{mode: FileMode(0644)},
-			out: out{},
-		},
-		{
-			in:  in{mode: FileMode(01755)},
-			out: out{},
-		},
-		{
-			in:  in{mode: FileMode(07777)},
-			out: out{},
-		},
-		{
-			in:  in{mode: FileMode(010000)},
-			out: out{err: ErrFileIllegalMode},
-		},
-	}
-
-	for i, test := range tests {
-		err := test.in.mode.assertValid()
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/filesystem.go

@@ -1,96 +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 config
-
-import (
-	"encoding/json"
-	"errors"
-)
-
-var (
-	ErrFilesystemRelativePath  = errors.New("device path not absolute")
-	ErrFilesystemInvalidFormat = errors.New("invalid filesystem format")
-)
-
-type Filesystem struct {
-	Device DevicePath        `json:"device,omitempty" yaml:"device"`
-	Format FilesystemFormat  `json:"format,omitempty" yaml:"format"`
-	Create *FilesystemCreate `json:"create,omitempty" yaml:"create"`
-	Files  []File            `json:"files,omitempty"  yaml:"files"`
-}
-
-type FilesystemCreate struct {
-	Force   bool        `json:"force,omitempty"   yaml:"force"`
-	Options MkfsOptions `json:"options,omitempty" yaml:"options"`
-}
-
-type FilesystemFormat string
-
-func (f *FilesystemFormat) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return f.unmarshal(unmarshal)
-}
-
-func (f *FilesystemFormat) UnmarshalJSON(data []byte) error {
-	return f.unmarshal(func(tf interface{}) error {
-		return json.Unmarshal(data, tf)
-	})
-}
-
-type filesystemFormat FilesystemFormat
-
-func (f *FilesystemFormat) unmarshal(unmarshal func(interface{}) error) error {
-	tf := filesystemFormat(*f)
-	if err := unmarshal(&tf); err != nil {
-		return err
-	}
-	*f = FilesystemFormat(tf)
-	return f.assertValid()
-}
-
-func (f FilesystemFormat) assertValid() error {
-	switch f {
-	case "ext4", "btrfs", "xfs":
-		return nil
-	default:
-		return ErrFilesystemInvalidFormat
-	}
-}
-
-type MkfsOptions []string
-
-func (o *MkfsOptions) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return o.unmarshal(unmarshal)
-}
-
-func (o *MkfsOptions) UnmarshalJSON(data []byte) error {
-	return o.unmarshal(func(to interface{}) error {
-		return json.Unmarshal(data, to)
-	})
-}
-
-type mkfsOptions MkfsOptions
-
-func (o *MkfsOptions) unmarshal(unmarshal func(interface{}) error) error {
-	to := mkfsOptions(*o)
-	if err := unmarshal(&to); err != nil {
-		return err
-	}
-	*o = MkfsOptions(to)
-	return o.assertValid()
-}
-
-func (o MkfsOptions) assertValid() error {
-	return nil
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/filesystem_test.go

@@ -1,302 +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 config
-
-import (
-	"encoding/json"
-	"errors"
-	"reflect"
-	"testing"
-
-	"github.com/coreos/ignition/third_party/github.com/go-yaml/yaml"
-)
-
-func TestDevicePathUnmarshalJSON(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		device DevicePath
-		err    error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `"/path"`},
-			out: out{device: DevicePath("/path")},
-		},
-		{
-			in:  in{data: `"bad"`},
-			out: out{device: DevicePath("bad"), err: errors.New("device path not absolute")},
-		},
-	}
-
-	for i, test := range tests {
-		var device DevicePath
-		err := json.Unmarshal([]byte(test.in.data), &device)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if !reflect.DeepEqual(test.out.device, device) {
-			t.Errorf("#%d: bad device: want %#v, got %#v", i, test.out.device, device)
-		}
-	}
-}
-
-func TestDevicePathUnmarshalYAML(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		device DevicePath
-		err    error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `"/path"`},
-			out: out{device: DevicePath("/path")},
-		},
-		{
-			in:  in{data: `"bad"`},
-			out: out{device: DevicePath("bad"), err: errors.New("device path not absolute")},
-		},
-	}
-
-	for i, test := range tests {
-		var device DevicePath
-		err := yaml.Unmarshal([]byte(test.in.data), &device)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if !reflect.DeepEqual(test.out.device, device) {
-			t.Errorf("#%d: bad device: want %#v, got %#v", i, test.out.device, device)
-		}
-	}
-}
-
-func TestDevicePathAssertValid(t *testing.T) {
-	type in struct {
-		device DevicePath
-	}
-	type out struct {
-		err error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{device: DevicePath("/good/path")},
-			out: out{},
-		},
-		{
-			in:  in{device: DevicePath("/name")},
-			out: out{},
-		},
-		{
-			in:  in{device: DevicePath("/this/is/a/fairly/long/path/to/a/device.")},
-			out: out{},
-		},
-		{
-			in:  in{device: DevicePath("/this one has spaces")},
-			out: out{},
-		},
-		{
-			in:  in{device: DevicePath("relative/path")},
-			out: out{err: errors.New("device path not absolute")},
-		},
-	}
-
-	for i, test := range tests {
-		err := test.in.device.assertValid()
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-	}
-}
-
-func TestFilesystemFormatUnmarshalJSON(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		format FilesystemFormat
-		err    error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `"ext4"`},
-			out: out{format: FilesystemFormat("ext4")},
-		},
-		{
-			in:  in{data: `"bad"`},
-			out: out{format: FilesystemFormat("bad"), err: errors.New("invalid filesystem format")},
-		},
-	}
-
-	for i, test := range tests {
-		var format FilesystemFormat
-		err := json.Unmarshal([]byte(test.in.data), &format)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if !reflect.DeepEqual(test.out.format, format) {
-			t.Errorf("#%d: bad format: want %#v, got %#v", i, test.out.format, format)
-		}
-	}
-}
-
-func TestFilesystemFormatUnmarshalYAML(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		format FilesystemFormat
-		err    error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `"ext4"`},
-			out: out{format: FilesystemFormat("ext4")},
-		},
-		{
-			in:  in{data: `"bad"`},
-			out: out{format: FilesystemFormat("bad"), err: errors.New("invalid filesystem format")},
-		},
-	}
-
-	for i, test := range tests {
-		var format FilesystemFormat
-		err := yaml.Unmarshal([]byte(test.in.data), &format)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if !reflect.DeepEqual(test.out.format, format) {
-			t.Errorf("#%d: bad device: want %#v, got %#v", i, test.out.format, format)
-		}
-	}
-}
-
-func TestFilesystemFormatAssertValid(t *testing.T) {
-	type in struct {
-		format FilesystemFormat
-	}
-	type out struct {
-		err error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{format: FilesystemFormat("ext4")},
-			out: out{},
-		},
-		{
-			in:  in{format: FilesystemFormat("btrfs")},
-			out: out{},
-		},
-		{
-			in:  in{format: FilesystemFormat("")},
-			out: out{err: errors.New("invalid filesystem format")},
-		},
-	}
-
-	for i, test := range tests {
-		err := test.in.format.assertValid()
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-	}
-}
-
-func TestMkfsOptionsUnmarshalJSON(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		options MkfsOptions
-		err     error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `["--label=ROOT"]`},
-			out: out{options: MkfsOptions([]string{"--label=ROOT"})},
-		},
-	}
-
-	for i, test := range tests {
-		var options MkfsOptions
-		err := json.Unmarshal([]byte(test.in.data), &options)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if !reflect.DeepEqual(test.out.options, options) {
-			t.Errorf("#%d: bad format: want %#v, got %#v", i, test.out.options, options)
-		}
-	}
-}
-
-func TestMkfsOptionsUnmarshalYAML(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		options MkfsOptions
-		err     error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `["--label=ROOT"]`},
-			out: out{options: MkfsOptions([]string{"--label=ROOT"})},
-		},
-	}
-
-	for i, test := range tests {
-		var options MkfsOptions
-		err := yaml.Unmarshal([]byte(test.in.data), &options)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if !reflect.DeepEqual(test.out.options, options) {
-			t.Errorf("#%d: bad device: want %#v, got %#v", i, test.out.options, options)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/group.go

@@ -1,22 +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 config
-
-type Group struct {
-	Name         string `json:"name,omitempty"          yaml:"name"`
-	Gid          *uint  `json:"gid,omitempty"           yaml:"gid"`
-	PasswordHash string `json:"passwordHash,omitempty"  yaml:"password_hash"`
-	System       bool   `json:"system,omitempty"        yaml:"system"`
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/networkd.go

@@ -1,19 +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 config
-
-type Networkd struct {
-	Units []NetworkdUnit `json:"units,omitempty" yaml:"units"`
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/partition.go

@@ -1,137 +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 config
-
-import (
-	"encoding/json"
-	"fmt"
-	"regexp"
-
-	"github.com/coreos/ignition/third_party/github.com/alecthomas/units"
-)
-
-type Partition struct {
-	Label    PartitionLabel     `json:"label,omitempty"    yaml:"label"`
-	Number   int                `json:"number"             yaml:"number"`
-	Size     PartitionDimension `json:"size"               yaml:"size"`
-	Start    PartitionDimension `json:"start"              yaml:"start"`
-	TypeGUID PartitionTypeGUID  `json:"typeGuid,omitempty" yaml:"type_guid"`
-}
-
-type PartitionLabel string
-
-func (n *PartitionLabel) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return n.unmarshal(unmarshal)
-}
-
-func (n *PartitionLabel) UnmarshalJSON(data []byte) error {
-	return n.unmarshal(func(tn interface{}) error {
-		return json.Unmarshal(data, tn)
-	})
-}
-
-type partitionLabel PartitionLabel
-
-func (n *PartitionLabel) unmarshal(unmarshal func(interface{}) error) error {
-	tn := partitionLabel(*n)
-	if err := unmarshal(&tn); err != nil {
-		return err
-	}
-	*n = PartitionLabel(tn)
-	return n.assertValid()
-}
-
-func (n PartitionLabel) assertValid() error {
-	// http://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_entries:
-	// 56 (0x38) 	72 bytes 	Partition name (36 UTF-16LE code units)
-
-	// XXX(vc): note GPT calls it a name, we're using label for consistency
-	// with udev naming /dev/disk/by-partlabel/*.
-	if len(string(n)) > 36 {
-		return fmt.Errorf("partition labels may not exceed 36 characters")
-	}
-	return nil
-}
-
-type PartitionDimension uint64
-
-func (n *PartitionDimension) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	// In YAML we allow human-readable dimensions like GiB/TiB etc.
-	var str string
-	if err := unmarshal(&str); err != nil {
-		return err
-	}
-
-	b2b, err := units.ParseBase2Bytes(str) // TODO(vc): replace the units package
-	if err != nil {
-		return err
-	}
-	if b2b < 0 {
-		return fmt.Errorf("negative value inappropriate: %q", str)
-	}
-
-	// Translate bytes into sectors
-	sectors := (b2b / 512)
-	if b2b%512 != 0 {
-		sectors++
-	}
-	*n = PartitionDimension(uint64(sectors))
-	return nil
-}
-
-func (n *PartitionDimension) UnmarshalJSON(data []byte) error {
-	// In JSON we expect plain integral sectors.
-	// The YAML->JSON conversion is responsible for normalizing human units to sectors.
-	var pd uint64
-	if err := json.Unmarshal(data, &pd); err != nil {
-		return err
-	}
-	*n = PartitionDimension(pd)
-	return nil
-}
-
-type PartitionTypeGUID string
-
-func (d *PartitionTypeGUID) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return d.unmarshal(unmarshal)
-}
-
-func (d *PartitionTypeGUID) UnmarshalJSON(data []byte) error {
-	return d.unmarshal(func(td interface{}) error {
-		return json.Unmarshal(data, td)
-	})
-}
-
-type partitionTypeGUID PartitionTypeGUID
-
-func (d *PartitionTypeGUID) unmarshal(unmarshal func(interface{}) error) error {
-	td := partitionTypeGUID(*d)
-	if err := unmarshal(&td); err != nil {
-		return err
-	}
-	*d = PartitionTypeGUID(td)
-	return d.assertValid()
-}
-
-func (d PartitionTypeGUID) assertValid() error {
-	ok, err := regexp.MatchString("[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}", string(d))
-	if err != nil {
-		return fmt.Errorf("error matching type-guid regexp: %v", err)
-	}
-	if !ok {
-		return fmt.Errorf(`partition type-guid must have the form "01234567-89AB-CDEF-EDCB-A98765432101", got: %q`, string(d))
-	}
-	return nil
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/passwd.go

@@ -1,20 +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 config
-
-type Passwd struct {
-	Users  []User  `json:"users,omitempty"  yaml:"users"`
-	Groups []Group `json:"groups,omitempty" yaml:"groups"`
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/raid.go

@@ -1,65 +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 config
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-type Raid struct {
-	Name    string       `json:"name"              yaml:"name"`
-	Level   string       `json:"level"             yaml:"level"`
-	Devices []DevicePath `json:"devices,omitempty" yaml:"devices"`
-	Spares  int          `json:"spares,omitempty"  yaml:"spares"`
-}
-
-func (n *Raid) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return n.unmarshal(unmarshal)
-}
-
-func (n *Raid) UnmarshalJSON(data []byte) error {
-	return n.unmarshal(func(tn interface{}) error {
-		return json.Unmarshal(data, tn)
-	})
-}
-
-type raid Raid
-
-func (n *Raid) unmarshal(unmarshal func(interface{}) error) error {
-	tn := raid(*n)
-	if err := unmarshal(&tn); err != nil {
-		return err
-	}
-	*n = Raid(tn)
-	return n.assertValid()
-}
-
-func (n Raid) assertValid() error {
-	switch n.Level {
-	case "linear", "raid0", "0", "stripe":
-		if n.Spares != 0 {
-			return fmt.Errorf("spares unsupported for %q arrays", n.Level)
-		}
-	case "raid1", "1", "mirror":
-	case "raid4", "4":
-	case "raid5", "5":
-	case "raid6", "6":
-	case "raid10", "10":
-	default:
-		return fmt.Errorf("unrecognized raid level: %q", n.Level)
-	}
-	return nil
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/storage.go

@@ -1,21 +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 config
-
-type Storage struct {
-	Disks       []Disk       `json:"disks,omitempty"       yaml:"disks"`
-	Arrays      []Raid       `json:"raid,omitempty"        yaml:"raid"`
-	Filesystems []Filesystem `json:"filesystems,omitempty" yaml:"filesystems"`
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/systemd.go

@@ -1,19 +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 config
-
-type Systemd struct {
-	Units []SystemdUnit `json:"units,omitempty" yaml:"units"`
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/unit.go

@@ -1,135 +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 config
-
-import (
-	"encoding/json"
-	"errors"
-	"path/filepath"
-)
-
-type SystemdUnit struct {
-	Name     SystemdUnitName     `json:"name,omitempty"     yaml:"name"`
-	Enable   bool                `json:"enable,omitempty"   yaml:"enable"`
-	Mask     bool                `json:"mask,omitempty"     yaml:"mask"`
-	Contents string              `json:"contents,omitempty" yaml:"contents"`
-	DropIns  []SystemdUnitDropIn `json:"dropins,omitempty"  yaml:"dropins"`
-}
-
-type SystemdUnitDropIn struct {
-	Name     SystemdUnitDropInName `json:"name,omitempty"     yaml:"name"`
-	Contents string                `json:"contents,omitempty" yaml:"contents"`
-}
-
-type SystemdUnitName string
-
-func (n *SystemdUnitName) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return n.unmarshal(unmarshal)
-}
-
-func (n *SystemdUnitName) UnmarshalJSON(data []byte) error {
-	return n.unmarshal(func(tn interface{}) error {
-		return json.Unmarshal(data, tn)
-	})
-}
-
-type systemdUnitName SystemdUnitName
-
-func (n *SystemdUnitName) unmarshal(unmarshal func(interface{}) error) error {
-	tn := systemdUnitName(*n)
-	if err := unmarshal(&tn); err != nil {
-		return err
-	}
-	*n = SystemdUnitName(tn)
-	return n.assertValid()
-}
-
-func (n SystemdUnitName) assertValid() error {
-	switch filepath.Ext(string(n)) {
-	case ".service", ".socket", ".device", ".mount", ".automount", ".swap", ".target", ".path", ".timer", ".snapshot", ".slice", ".scope":
-		return nil
-	default:
-		return errors.New("invalid systemd unit extension")
-	}
-}
-
-type SystemdUnitDropInName string
-
-func (n *SystemdUnitDropInName) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return n.unmarshal(unmarshal)
-}
-
-func (n *SystemdUnitDropInName) UnmarshalJSON(data []byte) error {
-	return n.unmarshal(func(tn interface{}) error {
-		return json.Unmarshal(data, tn)
-	})
-}
-
-type systemdUnitDropInName SystemdUnitDropInName
-
-func (n *SystemdUnitDropInName) unmarshal(unmarshal func(interface{}) error) error {
-	tn := systemdUnitDropInName(*n)
-	if err := unmarshal(&tn); err != nil {
-		return err
-	}
-	*n = SystemdUnitDropInName(tn)
-	return n.assertValid()
-}
-
-func (n SystemdUnitDropInName) assertValid() error {
-	switch filepath.Ext(string(n)) {
-	case ".conf":
-		return nil
-	default:
-		return errors.New("invalid systemd unit drop-in extension")
-	}
-}
-
-type NetworkdUnit struct {
-	Name     NetworkdUnitName `json:"name,omitempty"     yaml:"name"`
-	Contents string           `json:"contents,omitempty" yaml:"contents"`
-}
-
-type NetworkdUnitName string
-
-func (n *NetworkdUnitName) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return n.unmarshal(unmarshal)
-}
-
-func (n *NetworkdUnitName) UnmarshalJSON(data []byte) error {
-	return n.unmarshal(func(tn interface{}) error {
-		return json.Unmarshal(data, tn)
-	})
-}
-
-type networkdUnitName NetworkdUnitName
-
-func (n *NetworkdUnitName) unmarshal(unmarshal func(interface{}) error) error {
-	tn := networkdUnitName(*n)
-	if err := unmarshal(&tn); err != nil {
-		return err
-	}
-	*n = NetworkdUnitName(tn)
-	return n.assertValid()
-}
-
-func (n NetworkdUnitName) assertValid() error {
-	switch filepath.Ext(string(n)) {
-	case ".link", ".netdev", ".network":
-		return nil
-	default:
-		return errors.New("invalid networkd unit extension")
-	}
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/unit_test.go

@@ -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.
-
-package config
-
-import (
-	"encoding/json"
-	"errors"
-	"reflect"
-	"testing"
-
-	"github.com/coreos/ignition/third_party/github.com/go-yaml/yaml"
-)
-
-func TestSystemdUnitNameUnmarshalJSON(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		unit SystemdUnitName
-		err  error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `"test.service"`},
-			out: out{unit: SystemdUnitName("test.service")},
-		},
-		{
-			in:  in{data: `"test.socket"`},
-			out: out{unit: SystemdUnitName("test.socket")},
-		},
-		{
-			in:  in{data: `"test.blah"`},
-			out: out{err: errors.New("invalid systemd unit extension")},
-		},
-	}
-
-	for i, test := range tests {
-		var unit SystemdUnitName
-		err := json.Unmarshal([]byte(test.in.data), &unit)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if err != nil {
-			continue
-		}
-
-		if !reflect.DeepEqual(test.out.unit, unit) {
-			t.Errorf("#%d: bad unit: want %#v, got %#v", i, test.out.unit, unit)
-		}
-	}
-}
-
-func TestSystemdUnitNameUnmarshalYAML(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		unit SystemdUnitName
-		err  error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `"test.service"`},
-			out: out{unit: SystemdUnitName("test.service")},
-		},
-		{
-			in:  in{data: `"test.socket"`},
-			out: out{unit: SystemdUnitName("test.socket")},
-		},
-		{
-			in:  in{data: `"test.blah"`},
-			out: out{err: errors.New("invalid systemd unit extension")},
-		},
-	}
-
-	for i, test := range tests {
-		var unit SystemdUnitName
-		err := yaml.Unmarshal([]byte(test.in.data), &unit)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if err != nil {
-			continue
-		}
-
-		if !reflect.DeepEqual(test.out.unit, unit) {
-			t.Errorf("#%d: bad unit: want %#v, got %#v", i, test.out.unit, unit)
-		}
-	}
-}
-
-func TestNetworkdUnitNameUnmarshalJSON(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		unit NetworkdUnitName
-		err  error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `"test.network"`},
-			out: out{unit: NetworkdUnitName("test.network")},
-		},
-		{
-			in:  in{data: `"test.link"`},
-			out: out{unit: NetworkdUnitName("test.link")},
-		},
-		{
-			in:  in{data: `"test.netdev"`},
-			out: out{unit: NetworkdUnitName("test.netdev")},
-		},
-		{
-			in:  in{data: `"test.blah"`},
-			out: out{err: errors.New("invalid networkd unit extension")},
-		},
-	}
-
-	for i, test := range tests {
-		var unit NetworkdUnitName
-		err := json.Unmarshal([]byte(test.in.data), &unit)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if err != nil {
-			continue
-		}
-
-		if !reflect.DeepEqual(test.out.unit, unit) {
-			t.Errorf("#%d: bad unit: want %#v, got %#v", i, test.out.unit, unit)
-		}
-	}
-}
-
-func TestNetworkdUnitNameUnmarshalYAML(t *testing.T) {
-	type in struct {
-		data string
-	}
-	type out struct {
-		unit NetworkdUnitName
-		err  error
-	}
-
-	tests := []struct {
-		in  in
-		out out
-	}{
-		{
-			in:  in{data: `"test.network"`},
-			out: out{unit: NetworkdUnitName("test.network")},
-		},
-		{
-			in:  in{data: `"test.link"`},
-			out: out{unit: NetworkdUnitName("test.link")},
-		},
-		{
-			in:  in{data: `"test.netdev"`},
-			out: out{unit: NetworkdUnitName("test.netdev")},
-		},
-		{
-			in:  in{data: `"test.blah"`},
-			out: out{err: errors.New("invalid networkd unit extension")},
-		},
-	}
-
-	for i, test := range tests {
-		var unit NetworkdUnitName
-		err := yaml.Unmarshal([]byte(test.in.data), &unit)
-		if !reflect.DeepEqual(test.out.err, err) {
-			t.Errorf("#%d: bad error: want %v, got %v", i, test.out.err, err)
-		}
-		if err != nil {
-			continue
-		}
-
-		if !reflect.DeepEqual(test.out.unit, unit) {
-			t.Errorf("#%d: bad unit: want %#v, got %#v", i, test.out.unit, unit)
-		}
-	}
-}

Godeps/_workspace/src/github.com/coreos/ignition/src/config/user.go

@@ -1,35 +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 config
-
-type User struct {
-	Name              string      `json:"name,omitempty"              yaml:"name"`
-	PasswordHash      string      `json:"passwordHash,omitempty"      yaml:"password_hash"`
-	SSHAuthorizedKeys []string    `json:"sshAuthorizedKeys,omitempty" yaml:"ssh_authorized_keys"`
-	Create            *UserCreate `json:"create,omitempty"            yaml:"create"`
-}
-
-type UserCreate struct {
-	Uid          *uint    `json:"uid,omitempty"          yaml:"uid"`
-	GECOS        string   `json:"gecos,omitempty"        yaml:"gecos"`
-	Homedir      string   `json:"homeDir,omitempty"      yaml:"home_dir"`
-	NoCreateHome bool     `json:"noCreateHome,omitempty" yaml:"no_create_home"`
-	PrimaryGroup string   `json:"primaryGroup,omitempty" yaml:"primary_group"`
-	Groups       []string `json:"groups,omitempty"       yaml:"groups"`
-	NoUserGroup  bool     `json:"noUserGroup,omitempty"  yaml:"no_user_group"`
-	System       bool     `json:"system,omitempty"       yaml:"system"`
-	NoLogInit    bool     `json:"noLogInit,omitempty"    yaml:"no_log_init"`
-	Shell        string   `json:"shell,omitempty"        yaml:"shell"`
-}

Godeps/_workspace/src/github.com/coreos/ignition/third_party/github.com/alecthomas/units/COPYING

@@ -1,19 +0,0 @@
-Copyright (C) 2014 Alec Thomas
-
-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.

Godeps/_workspace/src/github.com/coreos/ignition/third_party/github.com/alecthomas/units/README.md

@@ -1,11 +0,0 @@
-# Units - Helpful unit multipliers and functions for Go
-
-The goal of this package is to have functionality similar to the [time](http://golang.org/pkg/time/) package.
-
-It allows for code like this:
-
-```go
-n, err := ParseBase2Bytes("1KB")
-// n == 1024
-n = units.Mebibyte * 512
-```

Godeps/_workspace/src/github.com/coreos/ignition/third_party/github.com/alecthomas/units/bytes.go

@@ -1,83 +0,0 @@
-package units
-
-// Base2Bytes is the old non-SI power-of-2 byte scale (1024 bytes in a kilobyte,
-// etc.).
-type Base2Bytes int64
-
-// Base-2 byte units.
-const (
-	Kibibyte Base2Bytes = 1024
-	KiB                 = Kibibyte
-	Mebibyte            = Kibibyte * 1024
-	MiB                 = Mebibyte
-	Gibibyte            = Mebibyte * 1024
-	GiB                 = Gibibyte
-	Tebibyte            = Gibibyte * 1024
-	TiB                 = Tebibyte
-	Pebibyte            = Tebibyte * 1024
-	PiB                 = Pebibyte
-	Exbibyte            = Pebibyte * 1024
-	EiB                 = Exbibyte
-)
-
-var (
-	bytesUnitMap    = MakeUnitMap("iB", "B", 1024)
-	oldBytesUnitMap = MakeUnitMap("B", "B", 1024)
-)
-
-// ParseBase2Bytes supports both iB and B in base-2 multipliers. That is, KB
-// and KiB are both 1024.
-func ParseBase2Bytes(s string) (Base2Bytes, error) {
-	n, err := ParseUnit(s, bytesUnitMap)
-	if err != nil {
-		n, err = ParseUnit(s, oldBytesUnitMap)
-	}
-	return Base2Bytes(n), err
-}
-
-func (b Base2Bytes) String() string {
-	return ToString(int64(b), 1024, "iB", "B")
-}
-
-var (
-	metricBytesUnitMap = MakeUnitMap("B", "B", 1000)
-)
-
-// MetricBytes are SI byte units (1000 bytes in a kilobyte).
-type MetricBytes SI
-
-// SI base-10 byte units.
-const (
-	Kilobyte MetricBytes = 1000
-	KB                   = Kilobyte
-	Megabyte             = Kilobyte * 1000
-	MB                   = Megabyte
-	Gigabyte             = Megabyte * 1000
-	GB                   = Gigabyte
-	Terabyte             = Gigabyte * 1000
-	TB                   = Terabyte
-	Petabyte             = Terabyte * 1000
-	PB                   = Petabyte
-	Exabyte              = Petabyte * 1000
-	EB                   = Exabyte
-)
-
-// ParseMetricBytes parses base-10 metric byte units. That is, KB is 1000 bytes.
-func ParseMetricBytes(s string) (MetricBytes, error) {
-	n, err := ParseUnit(s, metricBytesUnitMap)
-	return MetricBytes(n), err
-}
-
-func (m MetricBytes) String() string {
-	return ToString(int64(m), 1000, "B", "B")
-}
-
-// ParseStrictBytes supports both iB and B suffixes for base 2 and metric,
-// respectively. That is, KiB represents 1024 and KB represents 1000.
-func ParseStrictBytes(s string) (int64, error) {
-	n, err := ParseUnit(s, bytesUnitMap)
-	if err != nil {
-		n, err = ParseUnit(s, metricBytesUnitMap)
-	}
-	return int64(n), err
-}

Godeps/_workspace/src/github.com/coreos/ignition/third_party/github.com/alecthomas/units/bytes_test.go

@@ -1,49 +0,0 @@
-package units
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestBase2BytesString(t *testing.T) {
-	assert.Equal(t, Base2Bytes(0).String(), "0B")
-	assert.Equal(t, Base2Bytes(1025).String(), "1KiB1B")
-	assert.Equal(t, Base2Bytes(1048577).String(), "1MiB1B")
-}
-
-func TestParseBase2Bytes(t *testing.T) {
-	n, err := ParseBase2Bytes("0B")
-	assert.NoError(t, err)
-	assert.Equal(t, 0, n)
-	n, err = ParseBase2Bytes("1KB")
-	assert.NoError(t, err)
-	assert.Equal(t, 1024, n)
-	n, err = ParseBase2Bytes("1MB1KB25B")
-	assert.NoError(t, err)
-	assert.Equal(t, 1049625, n)
-	n, err = ParseBase2Bytes("1.5MB")
-	assert.NoError(t, err)
-	assert.Equal(t, 1572864, n)
-}
-
-func TestMetricBytesString(t *testing.T) {
-	assert.Equal(t, MetricBytes(0).String(), "0B")
-	assert.Equal(t, MetricBytes(1001).String(), "1KB1B")
-	assert.Equal(t, MetricBytes(1001025).String(), "1MB1KB25B")
-}
-
-func TestParseMetricBytes(t *testing.T) {
-	n, err := ParseMetricBytes("0B")
-	assert.NoError(t, err)
-	assert.Equal(t, 0, n)
-	n, err = ParseMetricBytes("1KB1B")
-	assert.NoError(t, err)
-	assert.Equal(t, 1001, n)
-	n, err = ParseMetricBytes("1MB1KB25B")
-	assert.NoError(t, err)
-	assert.Equal(t, 1001025, n)
-	n, err = ParseMetricBytes("1.5MB")
-	assert.NoError(t, err)
-	assert.Equal(t, 1500000, n)
-}

Godeps/_workspace/src/github.com/coreos/ignition/third_party/github.com/alecthomas/units/doc.go

@@ -1,13 +0,0 @@
-// Package units provides helpful unit multipliers and functions for Go.
-//
-// The goal of this package is to have functionality similar to the time [1] package.
-//
-//
-// [1] http://golang.org/pkg/time/
-//
-// It allows for code like this:
-//
-//     n, err := ParseBase2Bytes("1KB")
-//     // n == 1024
-//     n = units.Mebibyte * 512
-package units

Godeps/_workspace/src/github.com/coreos/ignition/third_party/github.com/alecthomas/units/si.go

@@ -1,26 +0,0 @@
-package units
-
-// SI units.
-type SI int64
-
-// SI unit multiples.
-const (
-	Kilo SI = 1000
-	Mega    = Kilo * 1000
-	Giga    = Mega * 1000
-	Tera    = Giga * 1000
-	Peta    = Tera * 1000
-	Exa     = Peta * 1000
-)
-
-func MakeUnitMap(suffix, shortSuffix string, scale int64) map[string]float64 {
-	return map[string]float64{
-		shortSuffix:  1,
-		"K" + suffix: float64(scale),
-		"M" + suffix: float64(scale * scale),
-		"G" + suffix: float64(scale * scale * scale),
-		"T" + suffix: float64(scale * scale * scale * scale),
-		"P" + suffix: float64(scale * scale * scale * scale * scale),
-		"E" + suffix: float64(scale * scale * scale * scale * scale * scale),
-	}
-}

Godeps/_workspace/src/github.com/coreos/ignition/third_party/github.com/alecthomas/units/util.go

@@ -1,138 +0,0 @@
-package units
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-)
-
-var (
-	siUnits = []string{"", "K", "M", "G", "T", "P", "E"}
-)
-
-func ToString(n int64, scale int64, suffix, baseSuffix string) string {
-	mn := len(siUnits)
-	out := make([]string, mn)
-	for i, m := range siUnits {
-		if n%scale != 0 || i == 0 && n == 0 {
-			s := suffix
-			if i == 0 {
-				s = baseSuffix
-			}
-			out[mn-1-i] = fmt.Sprintf("%d%s%s", n%scale, m, s)
-		}
-		n /= scale
-		if n == 0 {
-			break
-		}
-	}
-	return strings.Join(out, "")
-}
-
-// Below code ripped straight from http://golang.org/src/pkg/time/format.go?s=33392:33438#L1123
-var errLeadingInt = errors.New("units: bad [0-9]*") // never printed
-
-// leadingInt consumes the leading [0-9]* from s.
-func leadingInt(s string) (x int64, rem string, err error) {
-	i := 0
-	for ; i < len(s); i++ {
-		c := s[i]
-		if c < '0' || c > '9' {
-			break
-		}
-		if x >= (1<<63-10)/10 {
-			// overflow
-			return 0, "", errLeadingInt
-		}
-		x = x*10 + int64(c) - '0'
-	}
-	return x, s[i:], nil
-}
-
-func ParseUnit(s string, unitMap map[string]float64) (int64, error) {
-	// [-+]?([0-9]*(\.[0-9]*)?[a-z]+)+
-	orig := s
-	f := float64(0)
-	neg := false
-
-	// Consume [-+]?
-	if s != "" {
-		c := s[0]
-		if c == '-' || c == '+' {
-			neg = c == '-'
-			s = s[1:]
-		}
-	}
-	// Special case: if all that is left is "0", this is zero.
-	if s == "0" {
-		return 0, nil
-	}
-	if s == "" {
-		return 0, errors.New("units: invalid " + orig)
-	}
-	for s != "" {
-		g := float64(0) // this element of the sequence
-
-		var x int64
-		var err error
-
-		// The next character must be [0-9.]
-		if !(s[0] == '.' || ('0' <= s[0] && s[0] <= '9')) {
-			return 0, errors.New("units: invalid " + orig)
-		}
-		// Consume [0-9]*
-		pl := len(s)
-		x, s, err = leadingInt(s)
-		if err != nil {
-			return 0, errors.New("units: invalid " + orig)
-		}
-		g = float64(x)
-		pre := pl != len(s) // whether we consumed anything before a period
-
-		// Consume (\.[0-9]*)?
-		post := false
-		if s != "" && s[0] == '.' {
-			s = s[1:]
-			pl := len(s)
-			x, s, err = leadingInt(s)
-			if err != nil {
-				return 0, errors.New("units: invalid " + orig)
-			}
-			scale := 1.0
-			for n := pl - len(s); n > 0; n-- {
-				scale *= 10
-			}
-			g += float64(x) / scale
-			post = pl != len(s)
-		}
-		if !pre && !post {
-			// no digits (e.g. ".s" or "-.s")
-			return 0, errors.New("units: invalid " + orig)
-		}
-
-		// Consume unit.
-		i := 0
-		for ; i < len(s); i++ {
-			c := s[i]
-			if c == '.' || ('0' <= c && c <= '9') {
-				break
-			}
-		}
-		u := s[:i]
-		s = s[i:]
-		unit, ok := unitMap[u]
-		if !ok {
-			return 0, errors.New("units: unknown unit " + u + " in " + orig)
-		}
-
-		f += g * unit
-	}
-
-	if neg {
-		f = -f
-	}
-	if f < float64(-1<<63) || f > float64(1<<63-1) {
-		return 0, errors.New("units: overflow parsing unit")
-	}
-	return int64(f), nil
-}

Godeps/_workspace/src/github.com/coreos/ignition/third_party/github.com/camlistore/camlistore/pkg/errorutil/highlight.go

@@ -1,58 +0,0 @@
-/*
-Copyright 2011 Google 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 errorutil helps make better error messages.
-package errorutil
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"strings"
-)
-
-// HighlightBytePosition takes a reader and the location in bytes of a parse
-// error (for instance, from json.SyntaxError.Offset) and returns the line, column,
-// and pretty-printed context around the error with an arrow indicating the exact
-// position of the syntax error.
-func HighlightBytePosition(f io.Reader, pos int64) (line, col int, highlight string) {
-	line = 1
-	br := bufio.NewReader(f)
-	lastLine := ""
-	thisLine := new(bytes.Buffer)
-	for n := int64(0); n < pos; n++ {
-		b, err := br.ReadByte()
-		if err != nil {
-			break
-		}
-		if b == '\n' {
-			lastLine = thisLine.String()
-			thisLine.Reset()
-			line++
-			col = 1
-		} else {
-			col++
-			thisLine.WriteByte(b)
-		}
-	}
-	if line > 1 {
-		highlight += fmt.Sprintf("%5d: %s\n", line-1, lastLine)
-	}
-	highlight += fmt.Sprintf("%5d: %s\n", line, thisLine.String())
-	highlight += fmt.Sprintf("%s^\n", strings.Repeat(" ", col+5))
-	return
-}

Godeps/_workspace/src/github.com/coreos/pkg/capnslog/README.md

@@ -1,39 +0,0 @@
-# capnslog, the CoreOS logging package
-
-There are far too many logging packages out there, with varying degrees of licenses, far too many features (colorization, all sorts of log frameworks) or are just a pain to use (lack of `Fatalln()`?).
-capnslog provides a simple but consistent logging interface suitable for all kinds of projects.
-
-### Design Principles
-
-##### `package main` is the place where logging gets turned on and routed
-
-A library should not touch log options, only generate log entries. Libraries are silent until main lets them speak.
-
-##### All log options are runtime-configurable. 
-
-Still the job of `main` to expose these configurations. `main` may delegate this to, say, a configuration webhook, but does so explicitly. 
-
-##### There is one log object per package. It is registered under its repository and package name.
-
-`main` activates logging for its repository and any dependency repositories it would also like to have output in its logstream. `main` also dictates at which level each subpackage logs.
-
-##### There is *one* output stream, and it is an `io.Writer` composed with a formatter.
-
-Splitting streams is probably not the job of your program, but rather, your log aggregation framework. If you must split output streams, again, `main` configures this and you can write a very simple two-output struct that satisfies io.Writer.
-
-Fancy colorful formatting and JSON output are beyond the scope of a basic logging framework -- they're application/log-collector dependant. These are, at best, provided as options, but more likely, provided by your application.
-
-##### Log objects are an interface
-
-An object knows best how to print itself. Log objects can collect more interesting metadata if they wish, however, because text isn't going away anytime soon, they must all be marshalable to text. The simplest log object is a string, which returns itself. If you wish to do more fancy tricks for printing your log objects, see also JSON output -- introspect and write a formatter which can handle your advanced log interface. Making strings is the only thing guaranteed.
-
-##### Log levels have specific meanings:
-
-  * Critical: Unrecoverable. Must fail.
-  * Error: Data has been lost, a request has failed for a bad reason, or a required resource has been lost
-  * Warning: (Hopefully) Temporary conditions that may cause errors, but may work fine. A replica disappearing (that may reconnect) is a warning.
-  * Notice: Normal, but important (uncommon) log information.
-  * Info: Normal, working log information, everything is fine, but helpful notices for auditing or common operations.
-  * Debug: Everything is still fine, but even common operations may be logged, and less helpful but more quantity of notices.
-  * Trace: Anything goes, from logging every function call as part of a common operation, to tracing execution of a query.
-

Godeps/_workspace/src/github.com/coreos/pkg/capnslog/example/hello_dolly.go

@@ -1,57 +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"
-	oldlog "log"
-
-	"github.com/coreos/pkg/capnslog"
-)
-
-var logLevel = capnslog.INFO
-var log = capnslog.NewPackageLogger("github.com/coreos/pkg/capnslog/cmd", "main")
-var dlog = capnslog.NewPackageLogger("github.com/coreos/pkg/capnslog/cmd", "dolly")
-
-func init() {
-	flag.Var(&logLevel, "log-level", "Global log level.")
-}
-
-func main() {
-	rl := capnslog.MustRepoLogger("github.com/coreos/pkg/capnslog/cmd")
-
-	// We can parse the log level configs from the command line
-	flag.Parse()
-	if flag.NArg() > 1 {
-		cfg, err := rl.ParseLogLevelConfig(flag.Arg(1))
-		if err != nil {
-			log.Fatal(err)
-		}
-		rl.SetLogLevel(cfg)
-		log.Infof("Setting output to %s", flag.Arg(1))
-	}
-
-	// Send some messages at different levels to the different packages
-	dlog.Infof("Hello Dolly")
-	dlog.Warningf("Well hello, Dolly")
-	log.Errorf("It's so nice to have you back where you belong")
-	dlog.Debugf("You're looking swell, Dolly")
-	dlog.Tracef("I can tell, Dolly")
-
-	// We also have control over the built-in "log" package.
-	capnslog.SetGlobalLogLevel(logLevel)
-	oldlog.Println("You're still glowin', you're still crowin', you're still lookin' strong")
-	log.Fatalf("Dolly'll never go away again")
-}

Godeps/_workspace/src/github.com/coreos/pkg/capnslog/formatters.go

@@ -1,106 +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 capnslog
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"runtime"
-	"strings"
-	"time"
-)
-
-type Formatter interface {
-	Format(pkg string, level LogLevel, depth int, entries ...interface{})
-	Flush()
-}
-
-func NewStringFormatter(w io.Writer) *StringFormatter {
-	return &StringFormatter{
-		w: bufio.NewWriter(w),
-	}
-}
-
-type StringFormatter struct {
-	w *bufio.Writer
-}
-
-func (s *StringFormatter) Format(pkg string, l LogLevel, i int, entries ...interface{}) {
-	now := time.Now().UTC()
-	s.w.WriteString(now.Format(time.RFC3339))
-	s.w.WriteByte(' ')
-	writeEntries(s.w, pkg, l, i, entries...)
-	s.Flush()
-}
-
-func writeEntries(w *bufio.Writer, pkg string, _ LogLevel, _ int, entries ...interface{}) {
-	if pkg != "" {
-		w.WriteString(pkg + ": ")
-	}
-	str := fmt.Sprint(entries...)
-	endsInNL := strings.HasSuffix(str, "\n")
-	w.WriteString(str)
-	if !endsInNL {
-		w.WriteString("\n")
-	}
-}
-
-func (s *StringFormatter) Flush() {
-	s.w.Flush()
-}
-
-func NewPrettyFormatter(w io.Writer, debug bool) Formatter {
-	return &PrettyFormatter{
-		w:     bufio.NewWriter(w),
-		debug: debug,
-	}
-}
-
-type PrettyFormatter struct {
-	w     *bufio.Writer
-	debug bool
-}
-
-func (c *PrettyFormatter) Format(pkg string, l LogLevel, depth int, entries ...interface{}) {
-	now := time.Now()
-	ts := now.Format("2006-01-02 15:04:05")
-	c.w.WriteString(ts)
-	ms := now.Nanosecond() / 1000
-	c.w.WriteString(fmt.Sprintf(".%06d", ms))
-	if c.debug {
-		_, file, line, ok := runtime.Caller(depth) // It's always the same number of frames to the user's call.
-		if !ok {
-			file = "???"
-			line = 1
-		} else {
-			slash := strings.LastIndex(file, "/")
-			if slash >= 0 {
-				file = file[slash+1:]
-			}
-		}
-		if line < 0 {
-			line = 0 // not a real line number
-		}
-		c.w.WriteString(fmt.Sprintf(" [%s:%d]", file, line))
-	}
-	c.w.WriteString(fmt.Sprint(" ", l.Char(), " | "))
-	writeEntries(c.w, pkg, l, depth, entries...)
-	c.Flush()
-}
-
-func (c *PrettyFormatter) Flush() {
-	c.w.Flush()
-}

Godeps/_workspace/src/github.com/coreos/pkg/capnslog/glog_formatter.go

@@ -1,96 +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 capnslog
-
-import (
-	"bufio"
-	"bytes"
-	"io"
-	"os"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-)
-
-var pid = os.Getpid()
-
-type GlogFormatter struct {
-	StringFormatter
-}
-
-func NewGlogFormatter(w io.Writer) *GlogFormatter {
-	g := &GlogFormatter{}
-	g.w = bufio.NewWriter(w)
-	return g
-}
-
-func (g GlogFormatter) Format(pkg string, level LogLevel, depth int, entries ...interface{}) {
-	g.w.Write(GlogHeader(level, depth+1))
-	g.StringFormatter.Format(pkg, level, depth+1, entries...)
-}
-
-func GlogHeader(level LogLevel, depth int) []byte {
-	// Lmmdd hh:mm:ss.uuuuuu threadid file:line]
-	now := time.Now().UTC()
-	_, file, line, ok := runtime.Caller(depth) // It's always the same number of frames to the user's call.
-	if !ok {
-		file = "???"
-		line = 1
-	} else {
-		slash := strings.LastIndex(file, "/")
-		if slash >= 0 {
-			file = file[slash+1:]
-		}
-	}
-	if line < 0 {
-		line = 0 // not a real line number
-	}
-	buf := &bytes.Buffer{}
-	buf.Grow(30)
-	_, month, day := now.Date()
-	hour, minute, second := now.Clock()
-	buf.WriteString(level.Char())
-	twoDigits(buf, int(month))
-	twoDigits(buf, day)
-	buf.WriteByte(' ')
-	twoDigits(buf, hour)
-	buf.WriteByte(':')
-	twoDigits(buf, minute)
-	buf.WriteByte(':')
-	twoDigits(buf, second)
-	buf.WriteByte('.')
-	buf.WriteString(strconv.Itoa(now.Nanosecond() / 1000))
-	buf.WriteByte('Z')
-	buf.WriteByte(' ')
-	buf.WriteString(strconv.Itoa(pid))
-	buf.WriteByte(' ')
-	buf.WriteString(file)
-	buf.WriteByte(':')
-	buf.WriteString(strconv.Itoa(line))
-	buf.WriteByte(']')
-	buf.WriteByte(' ')
-	return buf.Bytes()
-}
-
-const digits = "0123456789"
-
-func twoDigits(b *bytes.Buffer, d int) {
-	c2 := digits[d%10]
-	d /= 10
-	c1 := digits[d%10]
-	b.WriteByte(c1)
-	b.WriteByte(c2)
-}

Godeps/_workspace/src/github.com/coreos/pkg/capnslog/init.go

@@ -1,49 +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 !windows
-
-package capnslog
-
-import (
-	"io"
-	"os"
-	"syscall"
-)
-
-// Here's where the opinionation comes in. We need some sensible defaults,
-// especially after taking over the log package. Your project (whatever it may
-// be) may see things differently. That's okay; there should be no defaults in
-// the main package that cannot be controlled or overridden programatically,
-// otherwise it's a bug. Doing so is creating your own init_log.go file much
-// like this one.
-
-func init() {
-	initHijack()
-
-	// Go `log` pacakge uses os.Stderr.
-	SetFormatter(NewDefaultFormatter(os.Stderr))
-	SetGlobalLogLevel(INFO)
-}
-
-func NewDefaultFormatter(out io.Writer) Formatter {
-	if syscall.Getppid() == 1 {
-		// We're running under init, which may be systemd.
-		f, err := NewJournaldFormatter()
-		if err == nil {
-			return f
-		}
-	}
-	return NewPrettyFormatter(out, false)
-}

Godeps/_workspace/src/github.com/coreos/pkg/capnslog/init_windows.go

@@ -1,25 +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 capnslog
-
-import "os"
-
-func init() {
-	initHijack()
-
-	// Go `log` package uses os.Stderr.
-	SetFormatter(NewPrettyFormatter(os.Stderr, false))
-	SetGlobalLogLevel(INFO)
-}

Godeps/_workspace/src/github.com/coreos/pkg/capnslog/journald_formatter.go

@@ -1,68 +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 !windows
-
-package capnslog
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/coreos/go-systemd/journal"
-)
-
-func NewJournaldFormatter() (Formatter, error) {
-	if !journal.Enabled() {
-		return nil, errors.New("No systemd detected")
-	}
-	return &journaldFormatter{}, nil
-}
-
-type journaldFormatter struct{}
-
-func (j *journaldFormatter) Format(pkg string, l LogLevel, _ int, entries ...interface{}) {
-	var pri journal.Priority
-	switch l {
-	case CRITICAL:
-		pri = journal.PriCrit
-	case ERROR:
-		pri = journal.PriErr
-	case WARNING:
-		pri = journal.PriWarning
-	case NOTICE:
-		pri = journal.PriNotice
-	case INFO:
-		pri = journal.PriInfo
-	case DEBUG:
-		pri = journal.PriDebug
-	case TRACE:
-		pri = journal.PriDebug
-	default:
-		panic("Unhandled loglevel")
-	}
-	msg := fmt.Sprint(entries...)
-	tags := map[string]string{
-		"PACKAGE":           pkg,
-		"SYSLOG_IDENTIFIER": filepath.Base(os.Args[0]),
-	}
-	err := journal.Send(msg, pri, tags)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-	}
-}
-
-func (j *journaldFormatter) Flush() {}

Godeps/_workspace/src/github.com/coreos/pkg/capnslog/log_hijack.go

@@ -1,39 +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 capnslog
-
-import (
-	"log"
-)
-
-func initHijack() {
-	pkg := NewPackageLogger("log", "")
-	w := packageWriter{pkg}
-	log.SetFlags(0)
-	log.SetPrefix("")
-	log.SetOutput(w)
-}
-
-type packageWriter struct {
-	pl *PackageLogger
-}
-
-func (p packageWriter) Write(b []byte) (int, error) {
-	if p.pl.level < INFO {
-		return 0, nil
-	}
-	p.pl.internalLog(calldepth+2, INFO, string(b))
-	return len(b), nil
-}

Godeps/_workspace/src/github.com/coreos/pkg/capnslog/logmap.go

@@ -1,240 +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 capnslog
-
-import (
-	"errors"
-	"strings"
-	"sync"
-)
-
-// LogLevel is the set of all log levels.
-type LogLevel int8
-
-const (
-	// CRITICAL is the lowest log level; only errors which will end the program will be propagated.
-	CRITICAL LogLevel = iota - 1
-	// ERROR is for errors that are not fatal but lead to troubling behavior.
-	ERROR
-	// WARNING is for errors which are not fatal and not errors, but are unusual. Often sourced from misconfigurations.
-	WARNING
-	// NOTICE is for normal but significant conditions.
-	NOTICE
-	// INFO is a log level for common, everyday log updates.
-	INFO
-	// DEBUG is the default hidden level for more verbose updates about internal processes.
-	DEBUG
-	// TRACE is for (potentially) call by call tracing of programs.
-	TRACE
-)
-
-// Char returns a single-character representation of the log level.
-func (l LogLevel) Char() string {
-	switch l {
-	case CRITICAL:
-		return "C"
-	case ERROR:
-		return "E"
-	case WARNING:
-		return "W"
-	case NOTICE:
-		return "N"
-	case INFO:
-		return "I"
-	case DEBUG:
-		return "D"
-	case TRACE:
-		return "T"
-	default:
-		panic("Unhandled loglevel")
-	}
-}
-
-// String returns a multi-character representation of the log level.
-func (l LogLevel) String() string {
-	switch l {
-	case CRITICAL:
-		return "CRITICAL"
-	case ERROR:
-		return "ERROR"
-	case WARNING:
-		return "WARNING"
-	case NOTICE:
-		return "NOTICE"
-	case INFO:
-		return "INFO"
-	case DEBUG:
-		return "DEBUG"
-	case TRACE:
-		return "TRACE"
-	default:
-		panic("Unhandled loglevel")
-	}
-}
-
-// Update using the given string value. Fulfills the flag.Value interface.
-func (l *LogLevel) Set(s string) error {
-	value, err := ParseLevel(s)
-	if err != nil {
-		return err
-	}
-
-	*l = value
-	return nil
-}
-
-// ParseLevel translates some potential loglevel strings into their corresponding levels.
-func ParseLevel(s string) (LogLevel, error) {
-	switch s {
-	case "CRITICAL", "C":
-		return CRITICAL, nil
-	case "ERROR", "0", "E":
-		return ERROR, nil
-	case "WARNING", "1", "W":
-		return WARNING, nil
-	case "NOTICE", "2", "N":
-		return NOTICE, nil
-	case "INFO", "3", "I":
-		return INFO, nil
-	case "DEBUG", "4", "D":
-		return DEBUG, nil
-	case "TRACE", "5", "T":
-		return TRACE, nil
-	}
-	return CRITICAL, errors.New("couldn't parse log level " + s)
-}
-
-type RepoLogger map[string]*PackageLogger
-
-type loggerStruct struct {
-	sync.Mutex
-	repoMap   map[string]RepoLogger
-	formatter Formatter
-}
-
-// logger is the global logger
-var logger = new(loggerStruct)
-
-// SetGlobalLogLevel sets the log level for all packages in all repositories
-// registered with capnslog.
-func SetGlobalLogLevel(l LogLevel) {
-	logger.Lock()
-	defer logger.Unlock()
-	for _, r := range logger.repoMap {
-		r.setRepoLogLevelInternal(l)
-	}
-}
-
-// GetRepoLogger may return the handle to the repository's set of packages' loggers.
-func GetRepoLogger(repo string) (RepoLogger, error) {
-	logger.Lock()
-	defer logger.Unlock()
-	r, ok := logger.repoMap[repo]
-	if !ok {
-		return nil, errors.New("no packages registered for repo " + repo)
-	}
-	return r, nil
-}
-
-// MustRepoLogger returns the handle to the repository's packages' loggers.
-func MustRepoLogger(repo string) RepoLogger {
-	r, err := GetRepoLogger(repo)
-	if err != nil {
-		panic(err)
-	}
-	return r
-}
-
-// SetRepoLogLevel sets the log level for all packages in the repository.
-func (r RepoLogger) SetRepoLogLevel(l LogLevel) {
-	logger.Lock()
-	defer logger.Unlock()
-	r.setRepoLogLevelInternal(l)
-}
-
-func (r RepoLogger) setRepoLogLevelInternal(l LogLevel) {
-	for _, v := range r {
-		v.level = l
-	}
-}
-
-// ParseLogLevelConfig parses a comma-separated string of "package=loglevel", in
-// order, and returns a map of the results, for use in SetLogLevel.
-func (r RepoLogger) ParseLogLevelConfig(conf string) (map[string]LogLevel, error) {
-	setlist := strings.Split(conf, ",")
-	out := make(map[string]LogLevel)
-	for _, setstring := range setlist {
-		setting := strings.Split(setstring, "=")
-		if len(setting) != 2 {
-			return nil, errors.New("oddly structured `pkg=level` option: " + setstring)
-		}
-		l, err := ParseLevel(setting[1])
-		if err != nil {
-			return nil, err
-		}
-		out[setting[0]] = l
-	}
-	return out, nil
-}
-
-// SetLogLevel takes a map of package names within a repository to their desired
-// loglevel, and sets the levels appropriately. Unknown packages are ignored.
-// "*" is a special package name that corresponds to all packages, and will be
-// processed first.
-func (r RepoLogger) SetLogLevel(m map[string]LogLevel) {
-	logger.Lock()
-	defer logger.Unlock()
-	if l, ok := m["*"]; ok {
-		r.setRepoLogLevelInternal(l)
-	}
-	for k, v := range m {
-		l, ok := r[k]
-		if !ok {
-			continue
-		}
-		l.level = v
-	}
-}
-
-// SetFormatter sets the formatting function for all logs.
-func SetFormatter(f Formatter) {
-	logger.Lock()
-	defer logger.Unlock()
-	logger.formatter = f
-}
-
-// NewPackageLogger creates a package logger object.
-// This should be defined as a global var in your package, referencing your repo.
-func NewPackageLogger(repo string, pkg string) (p *PackageLogger) {
-	logger.Lock()
-	defer logger.Unlock()
-	if logger.repoMap == nil {
-		logger.repoMap = make(map[string]RepoLogger)
-	}
-	r, rok := logger.repoMap[repo]
-	if !rok {
-		logger.repoMap[repo] = make(RepoLogger)
-		r = logger.repoMap[repo]
-	}
-	p, pok := r[pkg]
-	if !pok {
-		r[pkg] = &PackageLogger{
-			pkg:   pkg,
-			level: INFO,
-		}
-		p = r[pkg]
-	}
-	return
-}

Godeps/_workspace/src/github.com/coreos/pkg/capnslog/pkg_logger.go

@@ -1,158 +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 capnslog
-
-import (
-	"fmt"
-	"os"
-)
-
-type PackageLogger struct {
-	pkg   string
-	level LogLevel
-}
-
-const calldepth = 2
-
-func (p *PackageLogger) internalLog(depth int, inLevel LogLevel, entries ...interface{}) {
-	if inLevel != CRITICAL && p.level < inLevel {
-		return
-	}
-	logger.Lock()
-	defer logger.Unlock()
-	if logger.formatter != nil {
-		logger.formatter.Format(p.pkg, inLevel, depth+1, entries...)
-	}
-}
-
-func (p *PackageLogger) LevelAt(l LogLevel) bool {
-	return p.level >= l
-}
-
-// Log a formatted string at any level between ERROR and TRACE
-func (p *PackageLogger) Logf(l LogLevel, format string, args ...interface{}) {
-	p.internalLog(calldepth, l, fmt.Sprintf(format, args...))
-}
-
-// Log a message at any level between ERROR and TRACE
-func (p *PackageLogger) Log(l LogLevel, args ...interface{}) {
-	p.internalLog(calldepth, l, fmt.Sprint(args...))
-}
-
-// log stdlib compatibility
-
-func (p *PackageLogger) Println(args ...interface{}) {
-	p.internalLog(calldepth, INFO, fmt.Sprintln(args...))
-}
-
-func (p *PackageLogger) Printf(format string, args ...interface{}) {
-	p.internalLog(calldepth, INFO, fmt.Sprintf(format, args...))
-}
-
-func (p *PackageLogger) Print(args ...interface{}) {
-	p.internalLog(calldepth, INFO, fmt.Sprint(args...))
-}
-
-// Panic and fatal
-
-func (p *PackageLogger) Panicf(format string, args ...interface{}) {
-	s := fmt.Sprintf(format, args...)
-	p.internalLog(calldepth, CRITICAL, s)
-	panic(s)
-}
-
-func (p *PackageLogger) Panic(args ...interface{}) {
-	s := fmt.Sprint(args...)
-	p.internalLog(calldepth, CRITICAL, s)
-	panic(s)
-}
-
-func (p *PackageLogger) Fatalf(format string, args ...interface{}) {
-	s := fmt.Sprintf(format, args...)
-	p.internalLog(calldepth, CRITICAL, s)
-	os.Exit(1)
-}
-
-func (p *PackageLogger) Fatal(args ...interface{}) {
-	s := fmt.Sprint(args...)
-	p.internalLog(calldepth, CRITICAL, s)
-	os.Exit(1)
-}
-
-// Error Functions
-
-func (p *PackageLogger) Errorf(format string, args ...interface{}) {
-	p.internalLog(calldepth, ERROR, fmt.Sprintf(format, args...))
-}
-
-func (p *PackageLogger) Error(entries ...interface{}) {
-	p.internalLog(calldepth, ERROR, entries...)
-}
-
-// Warning Functions
-
-func (p *PackageLogger) Warningf(format string, args ...interface{}) {
-	p.internalLog(calldepth, WARNING, fmt.Sprintf(format, args...))
-}
-
-func (p *PackageLogger) Warning(entries ...interface{}) {
-	p.internalLog(calldepth, WARNING, entries...)
-}
-
-// Notice Functions
-
-func (p *PackageLogger) Noticef(format string, args ...interface{}) {
-	p.internalLog(calldepth, NOTICE, fmt.Sprintf(format, args...))
-}
-
-func (p *PackageLogger) Notice(entries ...interface{}) {
-	p.internalLog(calldepth, NOTICE, entries...)
-}
-
-// Info Functions
-
-func (p *PackageLogger) Infof(format string, args ...interface{}) {
-	p.internalLog(calldepth, INFO, fmt.Sprintf(format, args...))
-}
-
-func (p *PackageLogger) Info(entries ...interface{}) {
-	p.internalLog(calldepth, INFO, entries...)
-}
-
-// Debug Functions
-
-func (p *PackageLogger) Debugf(format string, args ...interface{}) {
-	p.internalLog(calldepth, DEBUG, fmt.Sprintf(format, args...))
-}
-
-func (p *PackageLogger) Debug(entries ...interface{}) {
-	p.internalLog(calldepth, DEBUG, entries...)
-}
-
-// Trace Functions
-
-func (p *PackageLogger) Tracef(format string, args ...interface{}) {
-	p.internalLog(calldepth, TRACE, fmt.Sprintf(format, args...))
-}
-
-func (p *PackageLogger) Trace(entries ...interface{}) {
-	p.internalLog(calldepth, TRACE, entries...)
-}
-
-func (p *PackageLogger) Flush() {
-	logger.Lock()
-	defer logger.Unlock()
-	logger.formatter.Flush()
-}

Godeps/_workspace/src/github.com/coreos/pkg/capnslog/syslog_formatter.go

@@ -1,65 +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 !windows
-
-package capnslog
-
-import (
-	"fmt"
-	"log/syslog"
-)
-
-func NewSyslogFormatter(w *syslog.Writer) Formatter {
-	return &syslogFormatter{w}
-}
-
-func NewDefaultSyslogFormatter(tag string) (Formatter, error) {
-	w, err := syslog.New(syslog.LOG_DEBUG, tag)
-	if err != nil {
-		return nil, err
-	}
-	return NewSyslogFormatter(w), nil
-}
-
-type syslogFormatter struct {
-	w *syslog.Writer
-}
-
-func (s *syslogFormatter) Format(pkg string, l LogLevel, _ int, entries ...interface{}) {
-	for _, entry := range entries {
-		str := fmt.Sprint(entry)
-		switch l {
-		case CRITICAL:
-			s.w.Crit(str)
-		case ERROR:
-			s.w.Err(str)
-		case WARNING:
-			s.w.Warning(str)
-		case NOTICE:
-			s.w.Notice(str)
-		case INFO:
-			s.w.Info(str)
-		case DEBUG:
-			s.w.Debug(str)
-		case TRACE:
-			s.w.Debug(str)
-		default:
-			panic("Unhandled loglevel")
-		}
-	}
-}
-
-func (s *syslogFormatter) Flush() {
-}