Hello community,
here is the log from the commit of package ignition-config-transpiler for
openSUSE:Factory checked in at 2020-01-29 13:17:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ignition-config-transpiler (Old)
and /work/SRC/openSUSE:Factory/.ignition-config-transpiler.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ignition-config-transpiler"
Wed Jan 29 13:17:18 2020 rev:4 rq:768013 version:0.4.0+git20200124.846a5a4
Changes:
--------
---
/work/SRC/openSUSE:Factory/ignition-config-transpiler/ignition-config-transpiler.changes
2020-01-19 20:58:06.764071529 +0100
+++
/work/SRC/openSUSE:Factory/.ignition-config-transpiler.new.26092/ignition-config-transpiler.changes
2020-01-29 13:18:11.746164169 +0100
@@ -1,0 +2,15 @@
+Tue Jan 28 12:16:44 UTC 2020 - ku...@suse.de
+
+- Update to version 0.4.0+git20200124.846a5a4:
+ * news: add news for 0.4.0
+ * base/v0_2_exp: translate filesystem.mountOptions field
+ * go.mod: bump Ignition to 2.1.1
+ * docs: fix versions for 1.1.0-experimental
+ * build*: use vendored dependencies
+ * test: don't gofmt vendored packages
+ * vendor: vendor dependencies
+ * {docs,release-checklist}: add Quay tag pointing to latest release
+ * release-checklist: fix caps
+ * news: add news for 0.3.0
+
+-------------------------------------------------------------------
Old:
----
fcct-0.2.0+git20191111.daeb3de.tar.xz
New:
----
fcct-0.4.0+git20200124.846a5a4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ignition-config-transpiler.spec ++++++
--- /var/tmp/diff_new_pack.bnjqHj/_old 2020-01-29 13:18:13.586165110 +0100
+++ /var/tmp/diff_new_pack.bnjqHj/_new 2020-01-29 13:18:13.590165112 +0100
@@ -17,7 +17,7 @@
Name: ignition-config-transpiler
-Version: 0.2.0+git20191111.daeb3de
+Version: 0.4.0+git20200124.846a5a4
Release: 0
Summary: Tool to convert a yaml config file into a Ignition
configuration
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.bnjqHj/_old 2020-01-29 13:18:13.610165122 +0100
+++ /var/tmp/diff_new_pack.bnjqHj/_new 2020-01-29 13:18:13.610165122 +0100
@@ -1,7 +1,6 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">0.2.0</param>
- <param name="versionformat">0.2.0+git%cd.%h</param>
+ <param name="versionformat">0.4.0+git%cd.%h</param>
<param name="url">git://github.com/coreos/fcct.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.bnjqHj/_old 2020-01-29 13:18:13.622165128 +0100
+++ /var/tmp/diff_new_pack.bnjqHj/_new 2020-01-29 13:18:13.622165128 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/coreos/fcct.git</param>
- <param
name="changesrevision">fe99a1be3f1fd1011538f51763d41b3d42b9fc70</param>
+ <param
name="changesrevision">e34c4a9de4a1f3cd5b2007cb9e2d2ecffac7b250</param>
</service>
</servicedata>
\ No newline at end of file
++++++ fcct-0.2.0+git20191111.daeb3de.tar.xz ->
fcct-0.4.0+git20200124.846a5a4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/.github/ISSUE_TEMPLATE/release-checklist.md
new/fcct-0.4.0+git20200124.846a5a4/.github/ISSUE_TEMPLATE/release-checklist.md
---
old/fcct-0.2.0+git20191111.daeb3de/.github/ISSUE_TEMPLATE/release-checklist.md
2019-11-11 18:17:48.000000000 +0100
+++
new/fcct-0.4.0+git20200124.846a5a4/.github/ISSUE_TEMPLATE/release-checklist.md
2020-01-24 17:45:50.000000000 +0100
@@ -4,7 +4,7 @@
- [ ] Ensure your local copy is up to date with master and your working
directory is clean
- [ ] Ensure you can sign commits and any yubikeys/smartcards are plugged in
- [ ] Run `./tag_release.sh <vX.Y.z> <git commit hash>`
- - [ ] Push that tag to Github
+ - [ ] Push that tag to GitHub
- [ ] Run `./build_releases`
- [ ] Sign the release artifacts by running
```
@@ -12,5 +12,8 @@
```
for each release artifact. Do not try to sign all of them at once by globbing.
If you do, gpg will sign the combination of all the release artifacts instead
of each one individually.
- - [ ] Create a draft release on Github and upload all the release artifacts
and their signatures. Copy and paste the release notes from NEWS here as well.
+ - [ ] Create a draft release on GitHub and upload all the release artifacts
and their signatures. Copy and paste the release notes from NEWS here as well.
- [ ] Publish the release
+ - Update the `release` tag on Quay:
+ - [ ] Visit the [Quay tags
page](https://quay.io/repository/coreos/fcct?tab=tags) and wait for a versioned
tag to appear
+ - [ ] Click the gear next to the tag, select "Add New Tag", enter
`release`, and confirm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcct-0.2.0+git20191111.daeb3de/NEWS
new/fcct-0.4.0+git20200124.846a5a4/NEWS
--- old/fcct-0.2.0+git20191111.daeb3de/NEWS 2019-11-11 18:17:48.000000000
+0100
+++ new/fcct-0.4.0+git20200124.846a5a4/NEWS 2020-01-24 17:45:50.000000000
+0100
@@ -1,3 +1,34 @@
+2020-01-24 FCCT 0.4.0
+
+ Features:
+
+ - Add mount_options field to filesystem entry
+
+ Misc Changes:
+
+ - Add "release" tag to container of latest release
+ - Vendor dependencies
+
+
+2020-01-23 FCCT 0.3.0
+
+ Features:
+
+ - Add v1.1.0-experimental spec
+ - Add with_mount_unit field to generate mount unit from filesystem entry
+
+ Bug Fixes:
+
+ - Report warnings and errors to stderr, not stdout
+ - Truncate output file before writing
+ - Fix line and column reporting
+
+ Misc Changes:
+
+ - Document syntax of inline file contents
+ - Document usage of published container image
+
+
2019-07-24 FCCT 0.2.0
Features:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/base/v0_2_exp/schema.go
new/fcct-0.4.0+git20200124.846a5a4/base/v0_2_exp/schema.go
--- old/fcct-0.2.0+git20191111.daeb3de/base/v0_2_exp/schema.go 2019-11-11
18:17:48.000000000 +0100
+++ new/fcct-0.4.0+git20200124.846a5a4/base/v0_2_exp/schema.go 2020-01-24
17:45:50.000000000 +0100
@@ -73,6 +73,7 @@
Device string `yaml:"device"`
Format *string `yaml:"format"`
Label *string `yaml:"label"`
+ MountOptions []string `yaml:"mount_options"`
Options []string `yaml:"options"`
Path *string `yaml:"path"`
UUID *string `yaml:"uuid"`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/base/v0_2_exp/translate.go
new/fcct-0.4.0+git20200124.846a5a4/base/v0_2_exp/translate.go
--- old/fcct-0.2.0+git20191111.daeb3de/base/v0_2_exp/translate.go
2019-11-11 18:17:48.000000000 +0100
+++ new/fcct-0.4.0+git20200124.846a5a4/base/v0_2_exp/translate.go
2020-01-24 17:45:50.000000000 +0100
@@ -125,7 +125,8 @@
func translateFilesystem(from Filesystem) (to types.Filesystem, tm
translate.TranslationSet) {
tr := translate.NewTranslator("yaml", "json")
- tm = tr.Translate(&from.Options, &to.Options).Prefix("options")
+ tm = tr.Translate(&from.MountOptions,
&to.MountOptions).Prefix("mount_options")
+ tm.MergeP("options", tr.Translate(&from.Options, &to.Options))
to.Device = from.Device
to.Label = from.Label
to.Format = from.Format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/base/v0_2_exp/translate_test.go
new/fcct-0.4.0+git20200124.846a5a4/base/v0_2_exp/translate_test.go
--- old/fcct-0.2.0+git20191111.daeb3de/base/v0_2_exp/translate_test.go
2019-11-11 18:17:48.000000000 +0100
+++ new/fcct-0.4.0+git20200124.846a5a4/base/v0_2_exp/translate_test.go
2020-01-24 17:45:50.000000000 +0100
@@ -290,6 +290,7 @@
Device: "/foo",
Format: util.StrToPtr("/bar"),
Label: util.StrToPtr("/baz"),
+ MountOptions: []string{"yes", "no", "maybe"},
Options: []string{"foo", "foo", "bar"},
Path: util.StrToPtr("/quux"),
UUID: util.StrToPtr("1234"),
@@ -300,6 +301,7 @@
Device: "/foo",
Format: util.StrToPtr("/bar"),
Label: util.StrToPtr("/baz"),
+ MountOptions: []types.MountOption{"yes",
"no", "maybe"},
Options: []types.FilesystemOption{"foo",
"foo", "bar"},
Path: util.StrToPtr("/quux"),
UUID: util.StrToPtr("1234"),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcct-0.2.0+git20191111.daeb3de/build
new/fcct-0.4.0+git20200124.846a5a4/build
--- old/fcct-0.2.0+git20191111.daeb3de/build 2019-11-11 18:17:48.000000000
+0100
+++ new/fcct-0.4.0+git20200124.846a5a4/build 2020-01-24 17:45:50.000000000
+0100
@@ -3,7 +3,7 @@
set -eu
export GO111MODULE=on
-export GOFLAGS=-mod=readonly
+export GOFLAGS=-mod=vendor
export CGO_ENABLED=0
version=$(git describe --dirty --always)
LDFLAGS="-w -X github.com/coreos/fcct/internal/version.Raw=$version"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcct-0.2.0+git20191111.daeb3de/build_releases
new/fcct-0.4.0+git20200124.846a5a4/build_releases
--- old/fcct-0.2.0+git20191111.daeb3de/build_releases 2019-11-11
18:17:48.000000000 +0100
+++ new/fcct-0.4.0+git20200124.846a5a4/build_releases 2020-01-24
17:45:50.000000000 +0100
@@ -3,7 +3,7 @@
set -euo pipefail
export GO111MODULE=on
-export GOFLAGS=-mod=readonly
+export GOFLAGS=-mod=vendor
export CGO_ENABLED=0
version=$(git describe --dirty --always)
LDFLAGS="-w -X github.com/coreos/fcct/internal/version.Raw=$version"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/docs/configuration-v1_1-exp.md
new/fcct-0.4.0+git20200124.846a5a4/docs/configuration-v1_1-exp.md
--- old/fcct-0.2.0+git20191111.daeb3de/docs/configuration-v1_1-exp.md
2019-11-11 18:17:48.000000000 +0100
+++ new/fcct-0.4.0+git20200124.846a5a4/docs/configuration-v1_1-exp.md
2020-01-24 17:45:50.000000000 +0100
@@ -5,7 +5,7 @@
The Fedora CoreOS configuration is a YAML document conforming to the following
specification, with **_italicized_** entries being optional:
* **variant** (string): used to differentiate configs for different operating
systems. Must be `fcos` for FCCT.
-* **version** (string): the semantic version of the spec for this document.
This document is for version `1.0.0` and generates Ignition configs with
version `3.0.0`.
+* **version** (string): the semantic version of the spec for this document.
This document is for version `1.1.0-experimental` and generates Ignition
configs with version `3.1.0-experimental`.
* **ignition** (object): metadata about the configuration itself.
* **_config_** (objects): options related to the configuration.
* **_merge_** (list of objects): a list of the configs to be merged to the
current config.
@@ -56,6 +56,7 @@
* **_label_** (string): the label of the filesystem.
* **_uuid_** (string): the uuid of the filesystem.
* **_options_** (list of strings): any additional options to be passed to
the format-specific mkfs utility.
+ * **_mount_options_** (list of strings): any special options to be passed
to the mount command.
* **_with_mount_unit_** (bool): Whether to generate a generic mount unit
for this filesystem as well. If a more specific unit is needed, a custom one
can be specified in the `systemd.units` section. The unit will be named with
the [escaped][systemd-escape] version of the `path`.
* **_files_** (list of objects): the list of files to be written. Every
file, directory and link must have a unique `path`.
* **path** (string): the absolute path to the file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/docs/getting-started.md
new/fcct-0.4.0+git20200124.846a5a4/docs/getting-started.md
--- old/fcct-0.2.0+git20191111.daeb3de/docs/getting-started.md 2019-11-11
18:17:48.000000000 +0100
+++ new/fcct-0.4.0+git20200124.846a5a4/docs/getting-started.md 2020-01-24
17:45:50.000000000 +0100
@@ -21,17 +21,17 @@
#### Container
-This example uses podman, but docker can also be used. Substitute v0.2.0 with
the desired version. Note that the `latest` tag corresponds with `master` and
not with the latest release.
+This example uses podman, but docker can also be used.
```bash
# Pull the desired version
-podman pull quay.io/coreos/fcct:v0.2.0
+podman pull quay.io/coreos/fcct:release
# Run fcct using standard in and standard out
-podman run -i --rm quay.io/coreos/fcct:v0.2.0 -pretty -strict <
your_config.fcc > transpiled_config.ign
+podman run -i --rm quay.io/coreos/fcct:release -pretty -strict <
your_config.fcc > transpiled_config.ign
# Run fcct using files.
-podman run --rm -v /path/to/your_config.fcc:/config.fcc:z
quay.io/coreos/fcct:v0.2.0 -pretty -strict -input /config.fcc >
transpiled_config.ign
+podman run --rm -v /path/to/your_config.fcc:/config.fcc:z
quay.io/coreos/fcct:release -pretty -strict -input /config.fcc >
transpiled_config.ign
```
### Writing and using Fedora CoreOS Configs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcct-0.2.0+git20191111.daeb3de/go.mod
new/fcct-0.4.0+git20200124.846a5a4/go.mod
--- old/fcct-0.2.0+git20191111.daeb3de/go.mod 2019-11-11 18:17:48.000000000
+0100
+++ new/fcct-0.4.0+git20200124.846a5a4/go.mod 2020-01-24 17:45:50.000000000
+0100
@@ -5,7 +5,7 @@
require (
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
- github.com/coreos/ignition/v2 v2.0.1
+ github.com/coreos/ignition/v2 v2.1.1
github.com/coreos/vcontext v0.0.0-20191017033345-260217907eb5
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/stretchr/testify v1.3.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcct-0.2.0+git20191111.daeb3de/go.sum
new/fcct-0.4.0+git20200124.846a5a4/go.sum
--- old/fcct-0.2.0+git20191111.daeb3de/go.sum 2019-11-11 18:17:48.000000000
+0100
+++ new/fcct-0.4.0+git20200124.846a5a4/go.sum 2020-01-24 17:45:50.000000000
+0100
@@ -7,8 +7,8 @@
github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod
h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8=
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod
h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/ignition/v2 v2.0.1
h1:aKZARDpl6rDr83Ur/fUoQ3uuSM0VCLH5nTERkLczJFM=
-github.com/coreos/ignition/v2 v2.0.1/go.mod
h1:EJP9Gk/u21BPwWa5nT6yYbm5mO0u8JQAAzFqaxgH7Fg=
+github.com/coreos/ignition/v2 v2.1.1
h1:siNZchKAWoLeV708X4QWG9chTYhssE93HBKkZx+JJO8=
+github.com/coreos/ignition/v2 v2.1.1/go.mod
h1:RqmqU64zxarUJa3l4cHtbhcSwfQLpUhv0WVziZwoXvE=
github.com/coreos/vcontext v0.0.0-20190529201340-22b159166068/go.mod
h1:E+6hug9bFSe0KZ2ZAzr8M9F5JlArJjv5D1JS7KSkPKE=
github.com/coreos/vcontext v0.0.0-20191017033345-260217907eb5
h1:DjoHHi6+9J7DGYPvBdmszKZLY+ucx2bnA77jf8KIk9M=
github.com/coreos/vcontext v0.0.0-20191017033345-260217907eb5/go.mod
h1:E+6hug9bFSe0KZ2ZAzr8M9F5JlArJjv5D1JS7KSkPKE=
@@ -17,6 +17,7 @@
github.com/davecgh/go-spew v1.1.1
h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384/go.mod
h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
+github.com/google/renameio v0.1.0/go.mod
h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.1.1/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod
h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod
h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
@@ -39,6 +40,7 @@
github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod
h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod
h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI=
golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod
h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20191110163157-d32e6e3b99c4/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405
h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcct-0.2.0+git20191111.daeb3de/test
new/fcct-0.4.0+git20200124.846a5a4/test
--- old/fcct-0.2.0+git20191111.daeb3de/test 2019-11-11 18:17:48.000000000
+0100
+++ new/fcct-0.4.0+git20200124.846a5a4/test 2020-01-24 17:45:50.000000000
+0100
@@ -3,8 +3,10 @@
export GO111MODULE=on
+SRC=$(find . -name '*.go' -not -path "./vendor/*")
+
echo "checking gofmt"
-res=$(gofmt -d .)
+res=$(gofmt -d $SRC)
echo "$res"
test -z "$res"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/shared/errors/errors.go
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/shared/errors/errors.go
---
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/shared/errors/errors.go
2019-11-11 18:17:48.000000000 +0100
+++
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/shared/errors/errors.go
2020-01-24 17:45:50.000000000 +0100
@@ -68,6 +68,8 @@
ErrZeroesWithShouldNotExist = errors.New("shouldExist is false for a
partition and other partition(s) has start or size 0")
ErrNeedLabelOrNumber = errors.New("a partition number >= 1 or a
label must be specified")
ErrDuplicateLabels = errors.New("cannot use the same
partition label twice")
+ ErrInvalidProxy = errors.New("proxies must be http(s)")
+ ErrInsecureProxy = errors.New("insecure plaintext HTTP
proxy specified for HTTPS resources")
// Systemd section errors
ErrInvalidSystemdExt = errors.New("invalid systemd unit
extension")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/v3_0/types/file.go
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/v3_0/types/file.go
---
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/v3_0/types/file.go
2019-11-11 18:17:48.000000000 +0100
+++
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/v3_0/types/file.go
2020-01-24 17:45:50.000000000 +0100
@@ -24,7 +24,7 @@
func (f File) Validate(c path.ContextPath) (r report.Report) {
r.Merge(f.Node.Validate(c))
r.AddOnError(c.Append("mode"), validateMode(f.Mode))
- if f.Mode == nil {
+ if f.Mode == nil && f.Contents.Source != nil {
r.AddOnWarn(c.Append("mode"), errors.ErrFilePermissionsUnset)
}
r.AddOnError(c.Append("overwrite"), f.validateOverwrite())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/file.go
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/file.go
---
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/file.go
2019-11-11 18:17:48.000000000 +0100
+++
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/file.go
2020-01-24 17:45:50.000000000 +0100
@@ -24,7 +24,7 @@
func (f File) Validate(c path.ContextPath) (r report.Report) {
r.Merge(f.Node.Validate(c))
r.AddOnError(c.Append("mode"), validateMode(f.Mode))
- if f.Mode == nil {
+ if f.Mode == nil && f.Contents.Source != nil {
r.AddOnWarn(c.Append("mode"), errors.ErrFilePermissionsUnset)
}
r.AddOnError(c.Append("overwrite"), f.validateOverwrite())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/filesystem.go
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/filesystem.go
---
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/filesystem.go
2019-11-11 18:17:48.000000000 +0100
+++
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/filesystem.go
2020-01-24 17:45:50.000000000 +0100
@@ -28,7 +28,8 @@
func (f Filesystem) IgnoreDuplicates() map[string]struct{} {
return map[string]struct{}{
- "Options": {},
+ "Options": {},
+ "MountOptions": {},
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/proxy.go
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/proxy.go
---
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/proxy.go
1970-01-01 01:00:00.000000000 +0100
+++
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/proxy.go
2020-01-24 17:45:50.000000000 +0100
@@ -0,0 +1,49 @@
+// Copyright 2019 Red Hat, 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 types
+
+import (
+ "net/url"
+
+ "github.com/coreos/ignition/v2/config/shared/errors"
+
+ "github.com/coreos/vcontext/path"
+ "github.com/coreos/vcontext/report"
+)
+
+func (p Proxy) Validate(c path.ContextPath) (r report.Report) {
+ validateProxyURL(p.HTTPProxy, c.Append("httpProxy"), &r, true)
+ validateProxyURL(p.HTTPSProxy, c.Append("httpsProxy"), &r, false)
+ return
+}
+
+func validateProxyURL(s *string, p path.ContextPath, r *report.Report, httpOk
bool) {
+ if s == nil {
+ return
+ }
+ u, err := url.Parse(*s)
+ if err != nil {
+ r.AddOnError(p, errors.ErrInvalidUrl)
+ return
+ }
+
+ if u.Scheme != "https" && u.Scheme != "http" {
+ r.AddOnError(p, errors.ErrInvalidProxy)
+ return
+ }
+ if u.Scheme == "http" && !httpOk {
+ r.AddOnWarn(p, errors.ErrInsecureProxy)
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/schema.go
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/schema.go
---
old/fcct-0.2.0+git20191111.daeb3de/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/schema.go
2019-11-11 18:17:48.000000000 +0100
+++
new/fcct-0.4.0+git20200124.846a5a4/vendor/github.com/coreos/ignition/v2/config/v3_1_experimental/types/schema.go
2020-01-24 17:45:50.000000000 +0100
@@ -62,6 +62,7 @@
Device string `json:"device"`
Format *string `json:"format,omitempty"`
Label *string `json:"label,omitempty"`
+ MountOptions []MountOption `json:"mountOptions,omitempty"`
Options []FilesystemOption `json:"options,omitempty"`
Path *string `json:"path,omitempty"`
UUID *string `json:"uuid,omitempty"`
@@ -95,6 +96,8 @@
Target string `json:"target"`
}
+type MountOption string
+
type NoProxyItem string
type Node struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fcct-0.2.0+git20191111.daeb3de/vendor/modules.txt
new/fcct-0.4.0+git20200124.846a5a4/vendor/modules.txt
--- old/fcct-0.2.0+git20191111.daeb3de/vendor/modules.txt 2019-11-11
18:17:48.000000000 +0100
+++ new/fcct-0.4.0+git20200124.846a5a4/vendor/modules.txt 2020-01-24
17:45:50.000000000 +0100
@@ -4,20 +4,20 @@
github.com/coreos/go-semver/semver
# github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
github.com/coreos/go-systemd/unit
-# github.com/coreos/ignition/v2 v2.0.1
-github.com/coreos/ignition/v2/config/v3_0/types
+# github.com/coreos/ignition/v2 v2.1.1
+github.com/coreos/ignition/v2/config/shared/errors
+github.com/coreos/ignition/v2/config/shared/validations
github.com/coreos/ignition/v2/config/util
+github.com/coreos/ignition/v2/config/v3_0/types
github.com/coreos/ignition/v2/config/v3_1_experimental/types
github.com/coreos/ignition/v2/config/validate
-github.com/coreos/ignition/v2/config/shared/errors
-github.com/coreos/ignition/v2/config/shared/validations
# github.com/coreos/vcontext v0.0.0-20191017033345-260217907eb5
+github.com/coreos/vcontext/json
github.com/coreos/vcontext/path
github.com/coreos/vcontext/report
github.com/coreos/vcontext/tree
-github.com/coreos/vcontext/yaml
github.com/coreos/vcontext/validate
-github.com/coreos/vcontext/json
+github.com/coreos/vcontext/yaml
# github.com/davecgh/go-spew v1.1.1
github.com/davecgh/go-spew/spew
# github.com/pmezard/go-difflib v1.0.0
