From 662547a81bda6b6555f2c83ab7d71281e270a76a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 23 Oct 2020 20:58:28 +0000 Subject: [PATCH] Add `openshift-install ignition convert` The transition to Ignition Spec 3 with 4.6 creates a discontinuity. Some users want to update their bootimages, e.g. for a cluster originally provisioned as 4.4 but upgraded in place to 4.6, it should be possible to directly use RHCOS 4.6 bootimages for new workers. In some cases in fact, this could be *required* for things like adding a node with newer hardware. The main stumbling block here is the pointer ignition config. Since `openshift-install` already includes Ignition bits, let's add translation capability here using https://github.com/coreos/ign-converter the same as the MCO uses. xref https://github.com/openshift/enhancements/pull/492#issuecomment-713096391 xref https://bugzilla.redhat.com/show_bug.cgi?id=1884750 --- cmd/openshift-install/ignition.go | 74 + cmd/openshift-install/main.go | 1 + go.mod | 2 + go.sum | 2 + vendor/github.com/ajeddeloh/go-json/README | 10 + vendor/github.com/ajeddeloh/go-json/decode.go | 1226 +++++++++++++++++ vendor/github.com/ajeddeloh/go-json/encode.go | 1194 ++++++++++++++++ vendor/github.com/ajeddeloh/go-json/fold.go | 143 ++ vendor/github.com/ajeddeloh/go-json/indent.go | 137 ++ .../github.com/ajeddeloh/go-json/scanner.go | 630 +++++++++ vendor/github.com/ajeddeloh/go-json/stream.go | 480 +++++++ vendor/github.com/ajeddeloh/go-json/tags.go | 44 + vendor/github.com/coreos/go-systemd/LICENSE | 191 +++ vendor/github.com/coreos/go-systemd/NOTICE | 5 + .../coreos/go-systemd/unit/deserialize.go | 278 ++++ .../coreos/go-systemd/unit/escape.go | 116 ++ .../coreos/go-systemd/unit/option.go | 59 + .../coreos/go-systemd/unit/serialize.go | 75 + .../github.com/coreos/ign-converter/LICENSE | 202 +++ .../translate/v24tov31/v24tov31.go | 552 ++++++++ .../coreos/ign-converter/util/util.go | 134 ++ vendor/github.com/coreos/ignition/LICENSE | 202 +++ vendor/github.com/coreos/ignition/NOTICE | 5 + .../ignition/config/shared/errors/errors.go | 109 ++ .../config/shared/validations/unit.go | 54 + .../coreos/ignition/config/util/helpers.go | 34 + .../ignition/config/util/parsingErrors.go | 74 + .../coreos/ignition/config/v1/cloudinit.go | 53 + .../coreos/ignition/config/v1/config.go | 59 + .../coreos/ignition/config/v1/types/config.go | 35 + .../coreos/ignition/config/v1/types/disk.go | 123 ++ .../coreos/ignition/config/v1/types/file.go | 39 + .../ignition/config/v1/types/filesystem.go | 45 + .../coreos/ignition/config/v1/types/group.go | 22 + .../ignition/config/v1/types/networkd.go | 19 + .../ignition/config/v1/types/partition.go | 60 + .../coreos/ignition/config/v1/types/passwd.go | 20 + .../coreos/ignition/config/v1/types/path.go | 31 + .../coreos/ignition/config/v1/types/raid.go | 44 + .../ignition/config/v1/types/storage.go | 21 + .../ignition/config/v1/types/systemd.go | 19 + .../coreos/ignition/config/v1/types/unit.go | 73 + .../coreos/ignition/config/v1/types/user.go | 35 + .../coreos/ignition/config/v2_0/append.go | 76 + .../coreos/ignition/config/v2_0/cloudinit.go | 53 + .../coreos/ignition/config/v2_0/config.go | 70 + .../coreos/ignition/config/v2_0/translate.go | 173 +++ .../ignition/config/v2_0/types/compression.go | 31 + .../ignition/config/v2_0/types/config.go | 87 ++ .../coreos/ignition/config/v2_0/types/disk.go | 126 ++ .../coreos/ignition/config/v2_0/types/file.go | 61 + .../ignition/config/v2_0/types/filesystem.go | 60 + .../ignition/config/v2_0/types/group.go | 22 + .../coreos/ignition/config/v2_0/types/hash.go | 72 + .../ignition/config/v2_0/types/ignition.go | 64 + .../ignition/config/v2_0/types/networkd.go | 19 + .../ignition/config/v2_0/types/partition.go | 64 + .../ignition/config/v2_0/types/passwd.go | 20 + .../coreos/ignition/config/v2_0/types/path.go | 35 + .../coreos/ignition/config/v2_0/types/raid.go | 44 + .../ignition/config/v2_0/types/storage.go | 22 + .../ignition/config/v2_0/types/systemd.go | 19 + .../coreos/ignition/config/v2_0/types/unit.go | 115 ++ .../coreos/ignition/config/v2_0/types/url.go | 69 + .../coreos/ignition/config/v2_0/types/user.go | 35 + .../config/v2_0/types/verification.go | 19 + .../coreos/ignition/config/v2_1/append.go | 76 + .../coreos/ignition/config/v2_1/cloudinit.go | 53 + .../coreos/ignition/config/v2_1/config.go | 68 + .../coreos/ignition/config/v2_1/translate.go | 236 ++++ .../ignition/config/v2_1/types/config.go | 91 ++ .../ignition/config/v2_1/types/directory.go | 30 + .../coreos/ignition/config/v2_1/types/disk.go | 128 ++ .../coreos/ignition/config/v2_1/types/file.go | 56 + .../ignition/config/v2_1/types/filesystem.go | 144 ++ .../ignition/config/v2_1/types/ignition.go | 52 + .../coreos/ignition/config/v2_1/types/mode.go | 26 + .../coreos/ignition/config/v2_1/types/node.go | 73 + .../ignition/config/v2_1/types/partition.go | 77 ++ .../ignition/config/v2_1/types/passwd.go | 67 + .../coreos/ignition/config/v2_1/types/path.go | 28 + .../coreos/ignition/config/v2_1/types/raid.go | 57 + .../ignition/config/v2_1/types/schema.go | 221 +++ .../coreos/ignition/config/v2_1/types/unit.go | 109 ++ .../coreos/ignition/config/v2_1/types/url.go | 52 + .../config/v2_1/types/verification.go | 77 ++ .../coreos/ignition/config/v2_2/append.go | 76 + .../coreos/ignition/config/v2_2/cloudinit.go | 53 + .../coreos/ignition/config/v2_2/config.go | 71 + .../coreos/ignition/config/v2_2/translate.go | 354 +++++ .../coreos/ignition/config/v2_2/types/ca.go | 27 + .../ignition/config/v2_2/types/config.go | 91 ++ .../ignition/config/v2_2/types/directory.go | 37 + .../coreos/ignition/config/v2_2/types/disk.go | 128 ++ .../coreos/ignition/config/v2_2/types/file.go | 69 + .../ignition/config/v2_2/types/filesystem.go | 144 ++ .../ignition/config/v2_2/types/ignition.go | 52 + .../coreos/ignition/config/v2_2/types/mode.go | 26 + .../coreos/ignition/config/v2_2/types/node.go | 73 + .../ignition/config/v2_2/types/partition.go | 77 ++ .../ignition/config/v2_2/types/passwd.go | 67 + .../coreos/ignition/config/v2_2/types/path.go | 28 + .../coreos/ignition/config/v2_2/types/raid.go | 57 + .../ignition/config/v2_2/types/schema.go | 246 ++++ .../coreos/ignition/config/v2_2/types/unit.go | 131 ++ .../coreos/ignition/config/v2_2/types/url.go | 53 + .../config/v2_2/types/verification.go | 77 ++ .../coreos/ignition/config/v2_3/append.go | 76 + .../coreos/ignition/config/v2_3/cloudinit.go | 53 + .../coreos/ignition/config/v2_3/config.go | 70 + .../coreos/ignition/config/v2_3/translate.go | 380 +++++ .../coreos/ignition/config/v2_3/types/ca.go | 27 + .../ignition/config/v2_3/types/config.go | 91 ++ .../ignition/config/v2_3/types/directory.go | 37 + .../coreos/ignition/config/v2_3/types/disk.go | 164 +++ .../coreos/ignition/config/v2_3/types/file.go | 71 + .../ignition/config/v2_3/types/filesystem.go | 146 ++ .../ignition/config/v2_3/types/ignition.go | 52 + .../coreos/ignition/config/v2_3/types/mode.go | 26 + .../coreos/ignition/config/v2_3/types/node.go | 73 + .../ignition/config/v2_3/types/partition.go | 112 ++ .../ignition/config/v2_3/types/passwd.go | 67 + .../coreos/ignition/config/v2_3/types/path.go | 28 + .../coreos/ignition/config/v2_3/types/raid.go | 57 + .../ignition/config/v2_3/types/schema.go | 250 ++++ .../coreos/ignition/config/v2_3/types/unit.go | 131 ++ .../coreos/ignition/config/v2_3/types/url.go | 53 + .../config/v2_3/types/verification.go | 77 ++ .../coreos/ignition/config/v2_4/append.go | 76 + .../coreos/ignition/config/v2_4/cloudinit.go | 53 + .../coreos/ignition/config/v2_4/config.go | 70 + .../coreos/ignition/config/v2_4/translate.go | 398 ++++++ .../coreos/ignition/config/v2_4/types/ca.go | 58 + .../ignition/config/v2_4/types/config.go | 91 ++ .../ignition/config/v2_4/types/directory.go | 37 + .../coreos/ignition/config/v2_4/types/disk.go | 164 +++ .../coreos/ignition/config/v2_4/types/file.go | 100 ++ .../ignition/config/v2_4/types/filesystem.go | 146 ++ .../ignition/config/v2_4/types/headers.go | 47 + .../ignition/config/v2_4/types/ignition.go | 82 ++ .../coreos/ignition/config/v2_4/types/mode.go | 26 + .../coreos/ignition/config/v2_4/types/node.go | 73 + .../ignition/config/v2_4/types/partition.go | 112 ++ .../ignition/config/v2_4/types/passwd.go | 67 + .../coreos/ignition/config/v2_4/types/path.go | 28 + .../coreos/ignition/config/v2_4/types/raid.go | 57 + .../ignition/config/v2_4/types/schema.go | 269 ++++ .../coreos/ignition/config/v2_4/types/unit.go | 131 ++ .../coreos/ignition/config/v2_4/types/url.go | 53 + .../config/v2_4/types/verification.go | 77 ++ .../config/v2_5_experimental/types/ca.go | 58 + .../config/v2_5_experimental/types/config.go | 92 ++ .../v2_5_experimental/types/directory.go | 37 + .../config/v2_5_experimental/types/disk.go | 164 +++ .../config/v2_5_experimental/types/file.go | 100 ++ .../v2_5_experimental/types/filesystem.go | 146 ++ .../config/v2_5_experimental/types/headers.go | 47 + .../v2_5_experimental/types/ignition.go | 82 ++ .../config/v2_5_experimental/types/mode.go | 26 + .../config/v2_5_experimental/types/node.go | 73 + .../v2_5_experimental/types/partition.go | 112 ++ .../config/v2_5_experimental/types/passwd.go | 67 + .../config/v2_5_experimental/types/path.go | 28 + .../config/v2_5_experimental/types/raid.go | 57 + .../config/v2_5_experimental/types/schema.go | 269 ++++ .../config/v2_5_experimental/types/unit.go | 131 ++ .../config/v2_5_experimental/types/url.go | 53 + .../v2_5_experimental/types/verification.go | 77 ++ .../ignition/config/validate/astjson/node.go | 73 + .../config/validate/astnode/astnode.go | 45 + .../ignition/config/validate/report/report.go | 158 +++ .../ignition/config/validate/validate.go | 242 ++++ vendor/go4.org/AUTHORS | 8 + vendor/go4.org/LICENSE | 202 +++ vendor/go4.org/errorutil/highlight.go | 58 + vendor/modules.txt | 32 + 176 files changed, 18438 insertions(+) create mode 100644 cmd/openshift-install/ignition.go create mode 100644 vendor/github.com/ajeddeloh/go-json/README create mode 100644 vendor/github.com/ajeddeloh/go-json/decode.go create mode 100644 vendor/github.com/ajeddeloh/go-json/encode.go create mode 100644 vendor/github.com/ajeddeloh/go-json/fold.go create mode 100644 vendor/github.com/ajeddeloh/go-json/indent.go create mode 100644 vendor/github.com/ajeddeloh/go-json/scanner.go create mode 100644 vendor/github.com/ajeddeloh/go-json/stream.go create mode 100644 vendor/github.com/ajeddeloh/go-json/tags.go create mode 100644 vendor/github.com/coreos/go-systemd/LICENSE create mode 100644 vendor/github.com/coreos/go-systemd/NOTICE create mode 100644 vendor/github.com/coreos/go-systemd/unit/deserialize.go create mode 100644 vendor/github.com/coreos/go-systemd/unit/escape.go create mode 100644 vendor/github.com/coreos/go-systemd/unit/option.go create mode 100644 vendor/github.com/coreos/go-systemd/unit/serialize.go create mode 100644 vendor/github.com/coreos/ign-converter/LICENSE create mode 100644 vendor/github.com/coreos/ign-converter/translate/v24tov31/v24tov31.go create mode 100644 vendor/github.com/coreos/ign-converter/util/util.go create mode 100644 vendor/github.com/coreos/ignition/LICENSE create mode 100644 vendor/github.com/coreos/ignition/NOTICE create mode 100644 vendor/github.com/coreos/ignition/config/shared/errors/errors.go create mode 100644 vendor/github.com/coreos/ignition/config/shared/validations/unit.go create mode 100644 vendor/github.com/coreos/ignition/config/util/helpers.go create mode 100644 vendor/github.com/coreos/ignition/config/util/parsingErrors.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/cloudinit.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/disk.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/file.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/filesystem.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/group.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/networkd.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/partition.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/passwd.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/path.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/raid.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/storage.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/systemd.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/unit.go create mode 100644 vendor/github.com/coreos/ignition/config/v1/types/user.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/append.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/cloudinit.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/translate.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/compression.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/disk.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/file.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/filesystem.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/group.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/hash.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/ignition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/networkd.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/partition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/passwd.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/path.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/raid.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/storage.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/systemd.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/unit.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/url.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/user.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_0/types/verification.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/append.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/cloudinit.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/translate.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/directory.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/disk.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/file.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/filesystem.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/ignition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/mode.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/node.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/partition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/passwd.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/path.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/raid.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/schema.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/unit.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/url.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_1/types/verification.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/append.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/cloudinit.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/translate.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/ca.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/directory.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/disk.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/file.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/filesystem.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/ignition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/mode.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/node.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/partition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/passwd.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/path.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/raid.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/schema.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/unit.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/url.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_2/types/verification.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/append.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/cloudinit.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/translate.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/ca.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/directory.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/disk.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/file.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/filesystem.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/ignition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/mode.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/node.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/partition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/passwd.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/path.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/raid.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/schema.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/unit.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/url.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_3/types/verification.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/append.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/cloudinit.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/translate.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/ca.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/directory.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/disk.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/file.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/filesystem.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/headers.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/ignition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/mode.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/node.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/partition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/passwd.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/path.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/raid.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/schema.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/unit.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/url.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_4/types/verification.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/ca.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/config.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/directory.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/disk.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/file.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/filesystem.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/headers.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/ignition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/mode.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/node.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/partition.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/passwd.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/path.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/raid.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/schema.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/unit.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/url.go create mode 100644 vendor/github.com/coreos/ignition/config/v2_5_experimental/types/verification.go create mode 100644 vendor/github.com/coreos/ignition/config/validate/astjson/node.go create mode 100644 vendor/github.com/coreos/ignition/config/validate/astnode/astnode.go create mode 100644 vendor/github.com/coreos/ignition/config/validate/report/report.go create mode 100644 vendor/github.com/coreos/ignition/config/validate/validate.go create mode 100644 vendor/go4.org/AUTHORS create mode 100644 vendor/go4.org/LICENSE create mode 100644 vendor/go4.org/errorutil/highlight.go diff --git a/cmd/openshift-install/ignition.go b/cmd/openshift-install/ignition.go new file mode 100644 index 00000000000..bceddc3daaf --- /dev/null +++ b/cmd/openshift-install/ignition.go @@ -0,0 +1,74 @@ +package main + +import ( + "encoding/json" + "fmt" + "io/ioutil" + "os" + + "github.com/pkg/errors" + "github.com/spf13/cobra" + ignv2 "github.com/coreos/ignition/config/v2_4" + "github.com/coreos/ign-converter/translate/v24tov31" +) + +func newIgnitionCmd() *cobra.Command { + cmd := &cobra.Command{ + Use: "ignition", + Short: "Operations on Ignition configs", + Long: `Operations on Ignition configs + +See sub-operations for details.`, + RunE: func(cmd *cobra.Command, args []string) error { + return cmd.Help() + }, + } + cmd.AddCommand(newIgnitionConvertCmd()) + return cmd +} + +var ( + ignitionConvertOpts struct { + source string + dest string + } +) + +func newIgnitionConvertCmd() *cobra.Command { + cmd := &cobra.Command{ + Use: "convert", + Short: "Convert a Spec2 config to Spec 3", + Long: `Convert a Spec2 config to Spec 3 + +OpenShift versions 4.6 and above use Ignition Spec 3. This +command can be used to translate the "pointer config" generated +by a prior version of openshift-install to Spec 3, so that +it can be used with newer bootimages. +`, + Args: cobra.ExactArgs(2), + + RunE: func(cmd *cobra.Command, args []string) error { + dataIn, err := ioutil.ReadFile(args[0]) + if err != nil { + return errors.Wrapf(err, "failed to read %s", args[0]) + } + dest := args[1] + cfg, rpt, err := ignv2.Parse(dataIn) + fmt.Fprintf(os.Stderr, "%s", rpt.String()) + if err != nil || rpt.IsFatal() { + return errors.Errorf("Error parsing spec v2 config: %v\n%v", err, rpt) + } + + newCfg, err := v24tov31.Translate(cfg, nil) + if err != nil { + return errors.Wrapf(err, "translation failed", err) + } + dataOut, err := json.Marshal(newCfg) + if err != nil { + return errors.Wrapf(err, "failed to marshal JSON") + } + return ioutil.WriteFile(dest, dataOut, 0666) + }, + } + return cmd +} \ No newline at end of file diff --git a/cmd/openshift-install/main.go b/cmd/openshift-install/main.go index 48bf7b6ebf0..a0c0fe8b1d7 100644 --- a/cmd/openshift-install/main.go +++ b/cmd/openshift-install/main.go @@ -63,6 +63,7 @@ func installerMain() { newCompletionCmd(), newMigrateCmd(), newExplainCmd(), + newIgnitionCmd(), } { rootCmd.AddCommand(subCmd) } diff --git a/go.mod b/go.mod index b110518310a..4a1c233462c 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,8 @@ require ( github.com/c4milo/gotoolkit v0.0.0-20190525173301-67483a18c17a // indirect github.com/clarketm/json v1.14.1 github.com/containers/image v3.0.2+incompatible + github.com/coreos/ign-converter v0.0.0-20200918193805-44d462f1c700 + github.com/coreos/ignition v0.35.0 github.com/coreos/ignition/v2 v2.3.0 github.com/dmacvicar/terraform-provider-libvirt v0.6.2 github.com/frankban/quicktest v1.7.2 // indirect diff --git a/go.sum b/go.sum index 108ff88b507..0964221b284 100644 --- a/go.sum +++ b/go.sum @@ -374,6 +374,8 @@ github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7 github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28= github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/ign-converter v0.0.0-20200629171308-e40a44f244c5/go.mod h1:LNu0WTt8iVH/WJH15R/SjZw7AdyY2qAyf9ILZTCBvho= +github.com/coreos/ign-converter v0.0.0-20200918193805-44d462f1c700 h1:Un1+sTzUeZGSr0gFIpHMUEZnwfBJeswD1ZJS05W8m/Y= +github.com/coreos/ign-converter v0.0.0-20200918193805-44d462f1c700/go.mod h1:LNu0WTt8iVH/WJH15R/SjZw7AdyY2qAyf9ILZTCBvho= github.com/coreos/ignition v0.33.0/go.mod h1:WJQapxzEn9DE0ryxsGvm8QnBajm/XsS/PkrDqSpz+bA= github.com/coreos/ignition v0.34.0/go.mod h1:WJQapxzEn9DE0ryxsGvm8QnBajm/XsS/PkrDqSpz+bA= github.com/coreos/ignition v0.35.0 h1:UFodoYq1mOPrbEjtxIsZbThcDyQwAI1owczRDqWmKkQ= diff --git a/vendor/github.com/ajeddeloh/go-json/README b/vendor/github.com/ajeddeloh/go-json/README new file mode 100644 index 00000000000..0f53d345016 --- /dev/null +++ b/vendor/github.com/ajeddeloh/go-json/README @@ -0,0 +1,10 @@ +This is a fork of go's encoding/json library. It adds the a third target for unmarshalling, json.Node. +Unmarshalling to a Node behaves similarilarly to unmarshalling to an interface{}, except it also records +the offsets for the start and end of the value that was unmarshalled and, if the value was part of a json +object, it also records the offsets of the start and end of the object's key. The Value field of the Node +will be unmarshalled to the same types as if it were an interface{}, except in the case of arrays and +objects. In those case it will be unmarshalled to a []Node or map[string]Node instead []interface{} or +map[string]interface{} for arrays and objects, respectively. + +There are two branchs, go15 and go16. go15 contains the modified go1.5 library and go16 contains the +modified go1.6 library. diff --git a/vendor/github.com/ajeddeloh/go-json/decode.go b/vendor/github.com/ajeddeloh/go-json/decode.go new file mode 100644 index 00000000000..1dc2fdf0d49 --- /dev/null +++ b/vendor/github.com/ajeddeloh/go-json/decode.go @@ -0,0 +1,1226 @@ +// Copyright 2010 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Represents JSON data structure using native Go types: booleans, floats, +// strings, arrays, and maps. + +package json + +import ( + "bytes" + "encoding" + "encoding/base64" + "errors" + "fmt" + "reflect" + "runtime" + "strconv" + "unicode" + "unicode/utf16" + "unicode/utf8" +) + +// Unmarshal parses the JSON-encoded data and stores the result +// in the value pointed to by v. +// +// Unmarshal uses the inverse of the encodings that +// Marshal uses, allocating maps, slices, and pointers as necessary, +// with the following additional rules: +// +// To unmarshal JSON into a pointer, Unmarshal first handles the case of +// the JSON being the JSON literal null. In that case, Unmarshal sets +// the pointer to nil. Otherwise, Unmarshal unmarshals the JSON into +// the value pointed at by the pointer. If the pointer is nil, Unmarshal +// allocates a new value for it to point to. +// +// To unmarshal JSON into a struct, Unmarshal matches incoming object +// keys to the keys used by Marshal (either the struct field name or its tag), +// preferring an exact match but also accepting a case-insensitive match. +// +// To unmarshal JSON into an interface value, +// Unmarshal stores one of these in the interface value: +// +// bool, for JSON booleans +// float64, for JSON numbers +// string, for JSON strings +// []interface{}, for JSON arrays +// map[string]interface{}, for JSON objects +// nil for JSON null +// +// To unmarshal a JSON array into a slice, Unmarshal resets the slice to nil +// and then appends each element to the slice. +// +// To unmarshal a JSON object into a map, Unmarshal replaces the map +// with an empty map and then adds key-value pairs from the object to +// the map. +// +// If a JSON value is not appropriate for a given target type, +// or if a JSON number overflows the target type, Unmarshal +// skips that field and completes the unmarshalling as best it can. +// If no more serious errors are encountered, Unmarshal returns +// an UnmarshalTypeError describing the earliest such error. +// +// The JSON null value unmarshals into an interface, map, pointer, or slice +// by setting that Go value to nil. Because null is often used in JSON to mean +// ``not present,'' unmarshaling a JSON null into any other Go type has no effect +// on the value and produces no error. +// +// When unmarshaling quoted strings, invalid UTF-8 or +// invalid UTF-16 surrogate pairs are not treated as an error. +// Instead, they are replaced by the Unicode replacement +// character U+FFFD. +// +func Unmarshal(data []byte, v interface{}) error { + // Check for well-formedness. + // Avoids filling out half a data structure + // before discovering a JSON syntax error. + var d decodeState + err := checkValid(data, &d.scan) + if err != nil { + return err + } + + d.init(data) + return d.unmarshal(v) +} + +// Unmarshaler is the interface implemented by objects +// that can unmarshal a JSON description of themselves. +// The input can be assumed to be a valid encoding of +// a JSON value. UnmarshalJSON must copy the JSON data +// if it wishes to retain the data after returning. +type Unmarshaler interface { + UnmarshalJSON([]byte) error +} + +// An UnmarshalTypeError describes a JSON value that was +// not appropriate for a value of a specific Go type. +type UnmarshalTypeError struct { + Value string // description of JSON value - "bool", "array", "number -5" + Type reflect.Type // type of Go value it could not be assigned to + Offset int64 // error occurred after reading Offset bytes +} + +func (e *UnmarshalTypeError) Error() string { + return "json: cannot unmarshal " + e.Value + " into Go value of type " + e.Type.String() +} + +// An UnmarshalFieldError describes a JSON object key that +// led to an unexported (and therefore unwritable) struct field. +// (No longer used; kept for compatibility.) +type UnmarshalFieldError struct { + Key string + Type reflect.Type + Field reflect.StructField +} + +func (e *UnmarshalFieldError) Error() string { + return "json: cannot unmarshal object key " + strconv.Quote(e.Key) + " into unexported field " + e.Field.Name + " of type " + e.Type.String() +} + +// An InvalidUnmarshalError describes an invalid argument passed to Unmarshal. +// (The argument to Unmarshal must be a non-nil pointer.) +type InvalidUnmarshalError struct { + Type reflect.Type +} + +type Node struct { + Start int + End int + KeyStart int // Only value if a member of a struct + KeyEnd int + Value interface{} +} + +func (e *InvalidUnmarshalError) Error() string { + if e.Type == nil { + return "json: Unmarshal(nil)" + } + + if e.Type.Kind() != reflect.Ptr { + return "json: Unmarshal(non-pointer " + e.Type.String() + ")" + } + return "json: Unmarshal(nil " + e.Type.String() + ")" +} + +func (d *decodeState) unmarshal(v interface{}) (err error) { + defer func() { + if r := recover(); r != nil { + if _, ok := r.(runtime.Error); ok { + panic(r) + } + err = r.(error) + } + }() + + rv := reflect.ValueOf(v) + if rv.Kind() != reflect.Ptr || rv.IsNil() { + return &InvalidUnmarshalError{reflect.TypeOf(v)} + } + + d.scan.reset() + // We decode rv not rv.Elem because the Unmarshaler interface + // test must be applied at the top level of the value. + d.value(rv) + return d.savedError +} + +// A Number represents a JSON number literal. +type Number string + +// String returns the literal text of the number. +func (n Number) String() string { return string(n) } + +// Float64 returns the number as a float64. +func (n Number) Float64() (float64, error) { + return strconv.ParseFloat(string(n), 64) +} + +// Int64 returns the number as an int64. +func (n Number) Int64() (int64, error) { + return strconv.ParseInt(string(n), 10, 64) +} + +// decodeState represents the state while decoding a JSON value. +type decodeState struct { + data []byte + off int // read offset in data + scan scanner + nextscan scanner // for calls to nextValue + savedError error + useNumber bool +} + +// errPhase is used for errors that should not happen unless +// there is a bug in the JSON decoder or something is editing +// the data slice while the decoder executes. +var errPhase = errors.New("JSON decoder out of sync - data changing underfoot?") + +func (d *decodeState) init(data []byte) *decodeState { + d.data = data + d.off = 0 + d.savedError = nil + return d +} + +// error aborts the decoding by panicking with err. +func (d *decodeState) error(err error) { + panic(err) +} + +// saveError saves the first err it is called with, +// for reporting at the end of the unmarshal. +func (d *decodeState) saveError(err error) { + if d.savedError == nil { + d.savedError = err + } +} + +// next cuts off and returns the next full JSON value in d.data[d.off:]. +// The next value is known to be an object or array, not a literal. +func (d *decodeState) next() []byte { + c := d.data[d.off] + item, rest, err := nextValue(d.data[d.off:], &d.nextscan) + if err != nil { + d.error(err) + } + d.off = len(d.data) - len(rest) + + // Our scanner has seen the opening brace/bracket + // and thinks we're still in the middle of the object. + // invent a closing brace/bracket to get it out. + if c == '{' { + d.scan.step(&d.scan, '}') + } else { + d.scan.step(&d.scan, ']') + } + + return item +} + +// scanWhile processes bytes in d.data[d.off:] until it +// receives a scan code not equal to op. +// It updates d.off and returns the new scan code. +func (d *decodeState) scanWhile(op int) int { + var newOp int + for { + if d.off >= len(d.data) { + newOp = d.scan.eof() + d.off = len(d.data) + 1 // mark processed EOF with len+1 + } else { + c := int(d.data[d.off]) + d.off++ + newOp = d.scan.step(&d.scan, c) + } + if newOp != op { + break + } + } + return newOp +} + +// value decodes a JSON value from d.data[d.off:] into the value. +// it updates d.off to point past the decoded value. +func (d *decodeState) value(v reflect.Value) { + if !v.IsValid() { + _, rest, err := nextValue(d.data[d.off:], &d.nextscan) + if err != nil { + d.error(err) + } + d.off = len(d.data) - len(rest) + + // d.scan thinks we're still at the beginning of the item. + // Feed in an empty string - the shortest, simplest value - + // so that it knows we got to the end of the value. + if d.scan.redo { + // rewind. + d.scan.redo = false + d.scan.step = stateBeginValue + } + d.scan.step(&d.scan, '"') + d.scan.step(&d.scan, '"') + + n := len(d.scan.parseState) + if n > 0 && d.scan.parseState[n-1] == parseObjectKey { + // d.scan thinks we just read an object key; finish the object + d.scan.step(&d.scan, ':') + d.scan.step(&d.scan, '"') + d.scan.step(&d.scan, '"') + d.scan.step(&d.scan, '}') + } + + return + } + + switch op := d.scanWhile(scanSkipSpace); op { + default: + d.error(errPhase) + + case scanBeginArray: + d.array(v) + + case scanBeginObject: + d.object(v) + + case scanBeginLiteral: + d.literal(v) + } +} + +type unquotedValue struct{} + +// valueQuoted is like value but decodes a +// quoted string literal or literal null into an interface value. +// If it finds anything other than a quoted string literal or null, +// valueQuoted returns unquotedValue{}. +func (d *decodeState) valueQuoted() interface{} { + switch op := d.scanWhile(scanSkipSpace); op { + default: + d.error(errPhase) + + case scanBeginArray: + d.array(reflect.Value{}) + + case scanBeginObject: + d.object(reflect.Value{}) + + case scanBeginLiteral: + switch v := d.literalInterface().(type) { + case nil, string: + return v + } + } + return unquotedValue{} +} + +// indirect walks down v allocating pointers as needed, +// until it gets to a non-pointer. +// if it encounters an Unmarshaler, indirect stops and returns that. +// if decodingNull is true, indirect stops at the last pointer so it can be set to nil. +func (d *decodeState) indirect(v reflect.Value, decodingNull bool) (Unmarshaler, encoding.TextUnmarshaler, reflect.Value) { + // If v is a named type and is addressable, + // start with its address, so that if the type has pointer methods, + // we find them. + if v.Kind() != reflect.Ptr && v.Type().Name() != "" && v.CanAddr() { + v = v.Addr() + } + for { + // Load value from interface, but only if the result will be + // usefully addressable. + if v.Kind() == reflect.Interface && !v.IsNil() { + e := v.Elem() + if e.Kind() == reflect.Ptr && !e.IsNil() && (!decodingNull || e.Elem().Kind() == reflect.Ptr) { + v = e + continue + } + } + + if v.Kind() != reflect.Ptr { + break + } + + if v.Elem().Kind() != reflect.Ptr && decodingNull && v.CanSet() { + break + } + if v.IsNil() { + v.Set(reflect.New(v.Type().Elem())) + } + if v.Type().NumMethod() > 0 { + if u, ok := v.Interface().(Unmarshaler); ok { + return u, nil, reflect.Value{} + } + if u, ok := v.Interface().(encoding.TextUnmarshaler); ok { + return nil, u, reflect.Value{} + } + } + v = v.Elem() + } + return nil, nil, v +} + +// array consumes an array from d.data[d.off-1:], decoding into the value v. +// the first byte of the array ('[') has been read already. +func (d *decodeState) array(v reflect.Value) { + // Check for unmarshaler. + u, ut, pv := d.indirect(v, false) + if u != nil { + d.off-- + err := u.UnmarshalJSON(d.next()) + if err != nil { + d.error(err) + } + return + } + if ut != nil { + d.saveError(&UnmarshalTypeError{"array", v.Type(), int64(d.off)}) + d.off-- + d.next() + return + } + + v = pv + + // Check type of target. + switch v.Kind() { + case reflect.Interface: + if v.NumMethod() == 0 { + // Decoding into nil interface? Switch to non-reflect code. + v.Set(reflect.ValueOf(d.arrayInterface())) + return + } + // Otherwise it's invalid. + fallthrough + default: + if v.Type() == reflect.TypeOf(Node{}) { + // Decoding to Node? Switch to that code + v.Set(reflect.ValueOf(d.arrayNode())) + return + } + d.saveError(&UnmarshalTypeError{"array", v.Type(), int64(d.off)}) + d.off-- + d.next() + return + case reflect.Array: + case reflect.Slice: + break + } + + i := 0 + for { + // Look ahead for ] - can only happen on first iteration. + op := d.scanWhile(scanSkipSpace) + if op == scanEndArray { + break + } + + // Back up so d.value can have the byte we just read. + d.off-- + d.scan.undo(op) + + // Get element of array, growing if necessary. + if v.Kind() == reflect.Slice { + // Grow slice if necessary + if i >= v.Cap() { + newcap := v.Cap() + v.Cap()/2 + if newcap < 4 { + newcap = 4 + } + newv := reflect.MakeSlice(v.Type(), v.Len(), newcap) + reflect.Copy(newv, v) + v.Set(newv) + } + if i >= v.Len() { + v.SetLen(i + 1) + } + } + + if i < v.Len() { + // Decode into element. + d.value(v.Index(i)) + } else { + // Ran out of fixed array: skip. + d.value(reflect.Value{}) + } + i++ + + // Next token must be , or ]. + op = d.scanWhile(scanSkipSpace) + if op == scanEndArray { + break + } + if op != scanArrayValue { + d.error(errPhase) + } + } + + if i < v.Len() { + if v.Kind() == reflect.Array { + // Array. Zero the rest. + z := reflect.Zero(v.Type().Elem()) + for ; i < v.Len(); i++ { + v.Index(i).Set(z) + } + } else { + v.SetLen(i) + } + } + if i == 0 && v.Kind() == reflect.Slice { + v.Set(reflect.MakeSlice(v.Type(), 0, 0)) + } +} + +var nullLiteral = []byte("null") + +// object consumes an object from d.data[d.off-1:], decoding into the value v. +// the first byte ('{') of the object has been read already. +func (d *decodeState) object(v reflect.Value) { + // Check for unmarshaler. + u, ut, pv := d.indirect(v, false) + if u != nil { + d.off-- + err := u.UnmarshalJSON(d.next()) + if err != nil { + d.error(err) + } + return + } + if ut != nil { + d.saveError(&UnmarshalTypeError{"object", v.Type(), int64(d.off)}) + d.off-- + d.next() // skip over { } in input + return + } + v = pv + + // Decoding into nil interface? Switch to non-reflect code. + if v.Kind() == reflect.Interface && v.NumMethod() == 0 { + v.Set(reflect.ValueOf(d.objectInterface())) + return + } else if v.Type() == reflect.TypeOf(Node{}) { + // Decoding to Node? Switch to that code + v.Set(reflect.ValueOf(d.objectNode())) + return + } + + // Check type of target: struct or map[string]T + switch v.Kind() { + case reflect.Map: + // map must have string kind + t := v.Type() + if t.Key().Kind() != reflect.String { + d.saveError(&UnmarshalTypeError{"object", v.Type(), int64(d.off)}) + d.off-- + d.next() // skip over { } in input + return + } + if v.IsNil() { + v.Set(reflect.MakeMap(t)) + } + case reflect.Struct: + + default: + d.saveError(&UnmarshalTypeError{"object", v.Type(), int64(d.off)}) + d.off-- + d.next() // skip over { } in input + return + } + + var mapElem reflect.Value + + for { + // Read opening " of string key or closing }. + op := d.scanWhile(scanSkipSpace) + if op == scanEndObject { + // closing } - can only happen on first iteration. + break + } + if op != scanBeginLiteral { + d.error(errPhase) + } + + // Read key. + start := d.off - 1 + op = d.scanWhile(scanContinue) + item := d.data[start : d.off-1] + key, ok := unquoteBytes(item) + if !ok { + d.error(errPhase) + } + + // Figure out field corresponding to key. + var subv reflect.Value + destring := false // whether the value is wrapped in a string to be decoded first + + if v.Kind() == reflect.Map { + elemType := v.Type().Elem() + if !mapElem.IsValid() { + mapElem = reflect.New(elemType).Elem() + } else { + mapElem.Set(reflect.Zero(elemType)) + } + subv = mapElem + } else { + var f *field + fields := cachedTypeFields(v.Type()) + for i := range fields { + ff := &fields[i] + if bytes.Equal(ff.nameBytes, key) { + f = ff + break + } + if f == nil && ff.equalFold(ff.nameBytes, key) { + f = ff + } + } + if f != nil { + subv = v + destring = f.quoted + for _, i := range f.index { + if subv.Kind() == reflect.Ptr { + if subv.IsNil() { + subv.Set(reflect.New(subv.Type().Elem())) + } + subv = subv.Elem() + } + subv = subv.Field(i) + } + } + } + + // Read : before value. + if op == scanSkipSpace { + op = d.scanWhile(scanSkipSpace) + } + if op != scanObjectKey { + d.error(errPhase) + } + + // Read value. + if destring { + switch qv := d.valueQuoted().(type) { + case nil: + d.literalStore(nullLiteral, subv, false) + case string: + d.literalStore([]byte(qv), subv, true) + default: + d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal unquoted value into %v", subv.Type())) + } + } else { + d.value(subv) + } + + // Write value back to map; + // if using struct, subv points into struct already. + if v.Kind() == reflect.Map { + kv := reflect.ValueOf(key).Convert(v.Type().Key()) + v.SetMapIndex(kv, subv) + } + + // Next token must be , or }. + op = d.scanWhile(scanSkipSpace) + if op == scanEndObject { + break + } + if op != scanObjectValue { + d.error(errPhase) + } + } +} + +// literal consumes a literal from d.data[d.off-1:], decoding into the value v. +// The first byte of the literal has been read already +// (that's how the caller knows it's a literal). +func (d *decodeState) literal(v reflect.Value) { + // All bytes inside literal return scanContinue op code. + start := d.off - 1 + op := d.scanWhile(scanContinue) + + // Scan read one byte too far; back up. + d.off-- + d.scan.undo(op) + + d.literalStore(d.data[start:d.off], v, false) +} + +// convertNumber converts the number literal s to a float64 or a Number +// depending on the setting of d.useNumber. +func (d *decodeState) convertNumber(s string) (interface{}, error) { + if d.useNumber { + return Number(s), nil + } + f, err := strconv.ParseFloat(s, 64) + if err != nil { + return nil, &UnmarshalTypeError{"number " + s, reflect.TypeOf(0.0), int64(d.off)} + } + return f, nil +} + +var numberType = reflect.TypeOf(Number("")) + +// literalStore decodes a literal stored in item into v. +// +// fromQuoted indicates whether this literal came from unwrapping a +// string from the ",string" struct tag option. this is used only to +// produce more helpful error messages. +func (d *decodeState) literalStore(item []byte, v reflect.Value, fromQuoted bool) { + // Check for unmarshaler. + if len(item) == 0 { + //Empty string given + d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) + return + } + wantptr := item[0] == 'n' // null + u, ut, pv := d.indirect(v, wantptr) + if u != nil { + err := u.UnmarshalJSON(item) + if err != nil { + d.error(err) + } + return + } + if ut != nil { + if item[0] != '"' { + if fromQuoted { + d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) + } else { + d.saveError(&UnmarshalTypeError{"string", v.Type(), int64(d.off)}) + } + return + } + s, ok := unquoteBytes(item) + if !ok { + if fromQuoted { + d.error(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) + } else { + d.error(errPhase) + } + } + err := ut.UnmarshalText(s) + if err != nil { + d.error(err) + } + return + } + + v = pv + + switch c := item[0]; c { + case 'n': // null + switch v.Kind() { + case reflect.Interface, reflect.Ptr, reflect.Map, reflect.Slice: + v.Set(reflect.Zero(v.Type())) + // otherwise, ignore null for primitives/string + } + case 't', 'f': // true, false + value := c == 't' + switch v.Kind() { + default: + if fromQuoted { + d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) + } else { + d.saveError(&UnmarshalTypeError{"bool", v.Type(), int64(d.off)}) + } + case reflect.Bool: + v.SetBool(value) + case reflect.Interface: + if v.NumMethod() == 0 { + v.Set(reflect.ValueOf(value)) + } else { + d.saveError(&UnmarshalTypeError{"bool", v.Type(), int64(d.off)}) + } + } + + case '"': // string + s, ok := unquoteBytes(item) + if !ok { + if fromQuoted { + d.error(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) + } else { + d.error(errPhase) + } + } + switch v.Kind() { + default: + d.saveError(&UnmarshalTypeError{"string", v.Type(), int64(d.off)}) + case reflect.Slice: + if v.Type().Elem().Kind() != reflect.Uint8 { + d.saveError(&UnmarshalTypeError{"string", v.Type(), int64(d.off)}) + break + } + b := make([]byte, base64.StdEncoding.DecodedLen(len(s))) + n, err := base64.StdEncoding.Decode(b, s) + if err != nil { + d.saveError(err) + break + } + v.Set(reflect.ValueOf(b[0:n])) + case reflect.String: + v.SetString(string(s)) + case reflect.Interface: + if v.NumMethod() == 0 { + v.Set(reflect.ValueOf(string(s))) + } else { + d.saveError(&UnmarshalTypeError{"string", v.Type(), int64(d.off)}) + } + } + + default: // number + if c != '-' && (c < '0' || c > '9') { + if fromQuoted { + d.error(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) + } else { + d.error(errPhase) + } + } + s := string(item) + switch v.Kind() { + default: + if v.Kind() == reflect.String && v.Type() == numberType { + v.SetString(s) + break + } + if fromQuoted { + d.error(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) + } else { + d.error(&UnmarshalTypeError{"number", v.Type(), int64(d.off)}) + } + case reflect.Interface: + n, err := d.convertNumber(s) + if err != nil { + d.saveError(err) + break + } + if v.NumMethod() != 0 { + d.saveError(&UnmarshalTypeError{"number", v.Type(), int64(d.off)}) + break + } + v.Set(reflect.ValueOf(n)) + + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + n, err := strconv.ParseInt(s, 10, 64) + if err != nil || v.OverflowInt(n) { + d.saveError(&UnmarshalTypeError{"number " + s, v.Type(), int64(d.off)}) + break + } + v.SetInt(n) + + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + n, err := strconv.ParseUint(s, 10, 64) + if err != nil || v.OverflowUint(n) { + d.saveError(&UnmarshalTypeError{"number " + s, v.Type(), int64(d.off)}) + break + } + v.SetUint(n) + + case reflect.Float32, reflect.Float64: + n, err := strconv.ParseFloat(s, v.Type().Bits()) + if err != nil || v.OverflowFloat(n) { + d.saveError(&UnmarshalTypeError{"number " + s, v.Type(), int64(d.off)}) + break + } + v.SetFloat(n) + } + } +} + +// The xxxInterface routines build up a value to be stored +// in an empty interface. They are not strictly necessary, +// but they avoid the weight of reflection in this common case. + +// valueInterface is like value but returns interface{} +func (d *decodeState) valueInterface() interface{} { + switch d.scanWhile(scanSkipSpace) { + default: + d.error(errPhase) + panic("unreachable") + case scanBeginArray: + return d.arrayInterface() + case scanBeginObject: + return d.objectInterface() + case scanBeginLiteral: + return d.literalInterface() + } +} + +// valueNode is like valueInterface but returns a wrapped version that +// contains metadata about where it decoded from +func (d *decodeState) valueNode() Node { + switch d.scanWhile(scanSkipSpace) { + default: + d.error(errPhase) + panic("unreachable") + case scanBeginArray: + return d.arrayNode() + case scanBeginObject: + return d.objectNode() + case scanBeginLiteral: + return d.literalNode() + } +} + +// arrayInterface is like array but returns []interface{}. +func (d *decodeState) arrayInterface() []interface{} { + var v = make([]interface{}, 0) + for { + // Look ahead for ] - can only happen on first iteration. + op := d.scanWhile(scanSkipSpace) + if op == scanEndArray { + break + } + + // Back up so d.value can have the byte we just read. + d.off-- + d.scan.undo(op) + + v = append(v, d.valueInterface()) + + // Next token must be , or ]. + op = d.scanWhile(scanSkipSpace) + if op == scanEndArray { + break + } + if op != scanArrayValue { + d.error(errPhase) + } + } + return v +} + +// arrayNode is like arrayInterface but returns Node. +func (d *decodeState) arrayNode() Node { + var v = make([]Node, 0) + node := Node{ + Start: d.off, + Value: v, + } + for { + // Look ahead for ] - can only happen on first iteration. + op := d.scanWhile(scanSkipSpace) + if op == scanEndArray { + break + } + + // Back up so d.value can have the byte we just read. + d.off-- + d.scan.undo(op) + + v = append(v, d.valueNode()) + + // Next token must be , or ]. + op = d.scanWhile(scanSkipSpace) + if op == scanEndArray { + break + } + if op != scanArrayValue { + d.error(errPhase) + } + } + node.Value = v + node.End = d.off - 1 + return node +} + +// objectInterface is like object but returns map[string]interface{}. +func (d *decodeState) objectInterface() map[string]interface{} { + m := make(map[string]interface{}) + for { + // Read opening " of string key or closing }. + op := d.scanWhile(scanSkipSpace) + if op == scanEndObject { + // closing } - can only happen on first iteration. + break + } + if op != scanBeginLiteral { + d.error(errPhase) + } + + // Read string key. + start := d.off - 1 + op = d.scanWhile(scanContinue) + item := d.data[start : d.off-1] + key, ok := unquote(item) + if !ok { + d.error(errPhase) + } + + // Read : before value. + if op == scanSkipSpace { + op = d.scanWhile(scanSkipSpace) + } + if op != scanObjectKey { + d.error(errPhase) + } + + // Read value. + m[key] = d.valueInterface() + + // Next token must be , or }. + op = d.scanWhile(scanSkipSpace) + if op == scanEndObject { + break + } + if op != scanObjectValue { + d.error(errPhase) + } + } + return m +} + +// objectNode is like object but returns Node. +func (d *decodeState) objectNode() Node { + m := make(map[string]Node) + node := Node{ + Start: d.off, + } + for { + // Read opening " of string key or closing }. + op := d.scanWhile(scanSkipSpace) + if op == scanEndObject { + // closing } - can only happen on first iteration. + break + } + if op != scanBeginLiteral { + d.error(errPhase) + } + + // Read string key. + start := d.off - 1 + op = d.scanWhile(scanContinue) + item := d.data[start : d.off-1] + keyEnd := d.off - 1 + key, ok := unquote(item) + if !ok { + d.error(errPhase) + } + + // Read : before value. + if op == scanSkipSpace { + op = d.scanWhile(scanSkipSpace) + } + if op != scanObjectKey { + d.error(errPhase) + } + + // Read value. + val := d.valueNode() + val.KeyStart = start + val.KeyEnd = keyEnd + m[key] = val + + // Next token must be , or }. + op = d.scanWhile(scanSkipSpace) + if op == scanEndObject { + break + } + if op != scanObjectValue { + d.error(errPhase) + } + } + node.Value = m + node.End = d.off - 1 + return node +} + +// literalInterface is like literal but returns an interface value. +func (d *decodeState) literalInterface() interface{} { + // All bytes inside literal return scanContinue op code. + start := d.off - 1 + op := d.scanWhile(scanContinue) + + // Scan read one byte too far; back up. + d.off-- + d.scan.undo(op) + item := d.data[start:d.off] + + switch c := item[0]; c { + case 'n': // null + return nil + + case 't', 'f': // true, false + return c == 't' + + case '"': // string + s, ok := unquote(item) + if !ok { + d.error(errPhase) + } + return s + + default: // number + if c != '-' && (c < '0' || c > '9') { + d.error(errPhase) + } + n, err := d.convertNumber(string(item)) + if err != nil { + d.saveError(err) + } + return n + } +} + +func (d *decodeState) literalNode() Node { + start := d.off - 1 + // Can just use the interface version since this has no children + node := Node{ + Start: start, + Value: d.literalInterface(), + } + node.End = d.off - 1 + return node +} + +// getu4 decodes \uXXXX from the beginning of s, returning the hex value, +// or it returns -1. +func getu4(s []byte) rune { + if len(s) < 6 || s[0] != '\\' || s[1] != 'u' { + return -1 + } + r, err := strconv.ParseUint(string(s[2:6]), 16, 64) + if err != nil { + return -1 + } + return rune(r) +} + +// unquote converts a quoted JSON string literal s into an actual string t. +// The rules are different than for Go, so cannot use strconv.Unquote. +func unquote(s []byte) (t string, ok bool) { + s, ok = unquoteBytes(s) + t = string(s) + return +} + +func unquoteBytes(s []byte) (t []byte, ok bool) { + if len(s) < 2 || s[0] != '"' || s[len(s)-1] != '"' { + return + } + s = s[1 : len(s)-1] + + // Check for unusual characters. If there are none, + // then no unquoting is needed, so return a slice of the + // original bytes. + r := 0 + for r < len(s) { + c := s[r] + if c == '\\' || c == '"' || c < ' ' { + break + } + if c < utf8.RuneSelf { + r++ + continue + } + rr, size := utf8.DecodeRune(s[r:]) + if rr == utf8.RuneError && size == 1 { + break + } + r += size + } + if r == len(s) { + return s, true + } + + b := make([]byte, len(s)+2*utf8.UTFMax) + w := copy(b, s[0:r]) + for r < len(s) { + // Out of room? Can only happen if s is full of + // malformed UTF-8 and we're replacing each + // byte with RuneError. + if w >= len(b)-2*utf8.UTFMax { + nb := make([]byte, (len(b)+utf8.UTFMax)*2) + copy(nb, b[0:w]) + b = nb + } + switch c := s[r]; { + case c == '\\': + r++ + if r >= len(s) { + return + } + switch s[r] { + default: + return + case '"', '\\', '/', '\'': + b[w] = s[r] + r++ + w++ + case 'b': + b[w] = '\b' + r++ + w++ + case 'f': + b[w] = '\f' + r++ + w++ + case 'n': + b[w] = '\n' + r++ + w++ + case 'r': + b[w] = '\r' + r++ + w++ + case 't': + b[w] = '\t' + r++ + w++ + case 'u': + r-- + rr := getu4(s[r:]) + if rr < 0 { + return + } + r += 6 + if utf16.IsSurrogate(rr) { + rr1 := getu4(s[r:]) + if dec := utf16.DecodeRune(rr, rr1); dec != unicode.ReplacementChar { + // A valid pair; consume. + r += 6 + w += utf8.EncodeRune(b[w:], dec) + break + } + // Invalid surrogate; fall back to replacement rune. + rr = unicode.ReplacementChar + } + w += utf8.EncodeRune(b[w:], rr) + } + + // Quote, control characters are invalid. + case c == '"', c < ' ': + return + + // ASCII + case c < utf8.RuneSelf: + b[w] = c + r++ + w++ + + // Coerce to well-formed UTF-8. + default: + rr, size := utf8.DecodeRune(s[r:]) + r += size + w += utf8.EncodeRune(b[w:], rr) + } + } + return b[0:w], true +} diff --git a/vendor/github.com/ajeddeloh/go-json/encode.go b/vendor/github.com/ajeddeloh/go-json/encode.go new file mode 100644 index 00000000000..90782deb70b --- /dev/null +++ b/vendor/github.com/ajeddeloh/go-json/encode.go @@ -0,0 +1,1194 @@ +// Copyright 2010 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package json implements encoding and decoding of JSON objects as defined in +// RFC 4627. The mapping between JSON objects and Go values is described +// in the documentation for the Marshal and Unmarshal functions. +// +// See "JSON and Go" for an introduction to this package: +// https://golang.org/doc/articles/json_and_go.html +package json + +import ( + "bytes" + "encoding" + "encoding/base64" + "math" + "reflect" + "runtime" + "sort" + "strconv" + "strings" + "sync" + "unicode" + "unicode/utf8" +) + +// Marshal returns the JSON encoding of v. +// +// Marshal traverses the value v recursively. +// If an encountered value implements the Marshaler interface +// and is not a nil pointer, Marshal calls its MarshalJSON method +// to produce JSON. The nil pointer exception is not strictly necessary +// but mimics a similar, necessary exception in the behavior of +// UnmarshalJSON. +// +// Otherwise, Marshal uses the following type-dependent default encodings: +// +// Boolean values encode as JSON booleans. +// +// Floating point, integer, and Number values encode as JSON numbers. +// +// String values encode as JSON strings coerced to valid UTF-8, +// replacing invalid bytes with the Unicode replacement rune. +// The angle brackets "<" and ">" are escaped to "\u003c" and "\u003e" +// to keep some browsers from misinterpreting JSON output as HTML. +// Ampersand "&" is also escaped to "\u0026" for the same reason. +// +// Array and slice values encode as JSON arrays, except that +// []byte encodes as a base64-encoded string, and a nil slice +// encodes as the null JSON object. +// +// Struct values encode as JSON objects. Each exported struct field +// becomes a member of the object unless +// - the field's tag is "-", or +// - the field is empty and its tag specifies the "omitempty" option. +// The empty values are false, 0, any +// nil pointer or interface value, and any array, slice, map, or string of +// length zero. The object's default key string is the struct field name +// but can be specified in the struct field's tag value. The "json" key in +// the struct field's tag value is the key name, followed by an optional comma +// and options. Examples: +// +// // Field is ignored by this package. +// Field int `json:"-"` +// +// // Field appears in JSON as key "myName". +// Field int `json:"myName"` +// +// // Field appears in JSON as key "myName" and +// // the field is omitted from the object if its value is empty, +// // as defined above. +// Field int `json:"myName,omitempty"` +// +// // Field appears in JSON as key "Field" (the default), but +// // the field is skipped if empty. +// // Note the leading comma. +// Field int `json:",omitempty"` +// +// The "string" option signals that a field is stored as JSON inside a +// JSON-encoded string. It applies only to fields of string, floating point, +// integer, or boolean types. This extra level of encoding is sometimes used +// when communicating with JavaScript programs: +// +// Int64String int64 `json:",string"` +// +// The key name will be used if it's a non-empty string consisting of +// only Unicode letters, digits, dollar signs, percent signs, hyphens, +// underscores and slashes. +// +// Anonymous struct fields are usually marshaled as if their inner exported fields +// were fields in the outer struct, subject to the usual Go visibility rules amended +// as described in the next paragraph. +// An anonymous struct field with a name given in its JSON tag is treated as +// having that name, rather than being anonymous. +// An anonymous struct field of interface type is treated the same as having +// that type as its name, rather than being anonymous. +// +// The Go visibility rules for struct fields are amended for JSON when +// deciding which field to marshal or unmarshal. If there are +// multiple fields at the same level, and that level is the least +// nested (and would therefore be the nesting level selected by the +// usual Go rules), the following extra rules apply: +// +// 1) Of those fields, if any are JSON-tagged, only tagged fields are considered, +// even if there are multiple untagged fields that would otherwise conflict. +// 2) If there is exactly one field (tagged or not according to the first rule), that is selected. +// 3) Otherwise there are multiple fields, and all are ignored; no error occurs. +// +// Handling of anonymous struct fields is new in Go 1.1. +// Prior to Go 1.1, anonymous struct fields were ignored. To force ignoring of +// an anonymous struct field in both current and earlier versions, give the field +// a JSON tag of "-". +// +// Map values encode as JSON objects. +// The map's key type must be string; the map keys are used as JSON object +// keys, subject to the UTF-8 coercion described for string values above. +// +// Pointer values encode as the value pointed to. +// A nil pointer encodes as the null JSON object. +// +// Interface values encode as the value contained in the interface. +// A nil interface value encodes as the null JSON object. +// +// Channel, complex, and function values cannot be encoded in JSON. +// Attempting to encode such a value causes Marshal to return +// an UnsupportedTypeError. +// +// JSON cannot represent cyclic data structures and Marshal does not +// handle them. Passing cyclic structures to Marshal will result in +// an infinite recursion. +// +func Marshal(v interface{}) ([]byte, error) { + e := &encodeState{} + err := e.marshal(v) + if err != nil { + return nil, err + } + return e.Bytes(), nil +} + +// MarshalIndent is like Marshal but applies Indent to format the output. +func MarshalIndent(v interface{}, prefix, indent string) ([]byte, error) { + b, err := Marshal(v) + if err != nil { + return nil, err + } + var buf bytes.Buffer + err = Indent(&buf, b, prefix, indent) + if err != nil { + return nil, err + } + return buf.Bytes(), nil +} + +// HTMLEscape appends to dst the JSON-encoded src with <, >, &, U+2028 and U+2029 +// characters inside string literals changed to \u003c, \u003e, \u0026, \u2028, \u2029 +// so that the JSON will be safe to embed inside HTML