From c3f02f7f4c8875605c5a9e314093cf40ab929813 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 12 Sep 2022 14:57:32 +0200 Subject: [PATCH] *: sed s/flatcar-linux/flatcar Signed-off-by: Mathieu Tortuyaux --- .github/workflows/docker.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- README.md | 14 +++++++------- config/astyaml/astyaml.go | 2 +- config/config.go | 14 +++++++------- config/config_test.go | 8 ++++---- config/templating/templating.go | 2 +- config/types/common.go | 16 ++++++++-------- config/types/config.go | 6 +++--- config/types/converter.go | 10 +++++----- config/types/disks.go | 6 +++--- config/types/docker.go | 6 +++--- config/types/etcd.go | 6 +++--- config/types/files.go | 10 +++++----- config/types/filesystems.go | 6 +++--- config/types/flannel.go | 6 +++--- config/types/locksmith.go | 2 +- config/types/locksmith_test.go | 2 +- config/types/networkd.go | 6 +++--- config/types/passwd.go | 6 +++--- config/types/raid.go | 6 +++--- config/types/security.go | 6 +++--- config/types/systemd.go | 6 +++--- config/types/update.go | 8 ++++---- config/types/update_test.go | 2 +- doc/configuration.md | 2 +- doc/getting-started.md | 2 +- doc/overview.md | 4 ++-- docker-build | 4 ++-- docker-push | 4 ++-- go.mod | 4 ++-- go.sum | 6 +++--- internal/main.go | 6 +++--- internal/util/tools/docs.go | 2 +- release.sh | 2 +- test | 2 +- .../ignition/LICENSE | 0 .../{flatcar-linux => flatcar}/ignition/NOTICE | 0 .../ignition/config/shared/errors/errors.go | 15 +++++++++------ .../ignition/config/shared/validations/unit.go | 4 ++-- .../ignition/config/v2_3/types/ca.go | 2 +- .../ignition/config/v2_3/types/config.go | 2 +- .../ignition/config/v2_3/types/directory.go | 4 ++-- .../ignition/config/v2_3/types/disk.go | 4 ++-- .../ignition/config/v2_3/types/file.go | 4 ++-- .../ignition/config/v2_3/types/filesystem.go | 4 ++-- .../ignition/config/v2_3/types/ignition.go | 4 ++-- .../ignition/config/v2_3/types/mode.go | 2 +- .../ignition/config/v2_3/types/node.go | 4 ++-- .../ignition/config/v2_3/types/partition.go | 4 ++-- .../ignition/config/v2_3/types/passwd.go | 4 ++-- .../ignition/config/v2_3/types/path.go | 2 +- .../ignition/config/v2_3/types/raid.go | 4 ++-- .../ignition/config/v2_3/types/schema.go | 0 .../ignition/config/v2_3/types/unit.go | 6 +++--- .../ignition/config/v2_3/types/url.go | 2 +- .../ignition/config/v2_3/types/verification.go | 4 ++-- .../ignition/config/validate/astjson/node.go | 2 +- .../config/validate/astnode/astnode.go | 0 .../ignition/config/validate/report/report.go | 0 .../ignition/config/validate/validate.go | 6 +++--- vendor/modules.txt | 18 +++++++++--------- 63 files changed, 152 insertions(+), 149 deletions(-) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/LICENSE (100%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/NOTICE (100%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/shared/errors/errors.go (89%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/shared/validations/unit.go (93%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/ca.go (93%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/config.go (97%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/directory.go (89%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/disk.go (97%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/file.go (93%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/filesystem.go (96%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/ignition.go (92%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/mode.go (92%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/node.go (93%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/partition.go (96%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/passwd.go (93%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/path.go (92%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/raid.go (92%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/schema.go (100%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/unit.go (94%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/url.go (95%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/v2_3/types/verification.go (93%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/validate/astjson/node.go (97%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/validate/astnode/astnode.go (100%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/validate/report/report.go (100%) rename vendor/github.com/{flatcar-linux => flatcar}/ignition/config/validate/validate.go (97%) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c1b85bb..1464d48 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,7 +5,7 @@ on: - v* env: REGISTRY: ghcr.io - IMAGE_NAME: flatcar-linux/ct + IMAGE_NAME: flatcar/ct jobs: docker: diff --git a/Dockerfile b/Dockerfile index d769b1e..062e2ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM golang:alpine ENV CGO_ENABLED=0 -WORKDIR $GOPATH/src/github.com/flatcar-linux/container-linux-config-transpiler +WORKDIR $GOPATH/src/github.com/flatcar/container-linux-config-transpiler COPY . . RUN apk update && apk add --virtual .build-deps bash git make \ && make \ diff --git a/Makefile b/Makefile index e50c366..ada2cb5 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ else endif VERSION=$(shell git describe --dirty) -REPO=github.com/flatcar-linux/container-linux-config-transpiler +REPO=github.com/flatcar/container-linux-config-transpiler LD_FLAGS="-w -X $(REPO)/internal/version.Raw=$(VERSION)" GO_SOURCES=$(shell find . -name "*.go") diff --git a/README.md b/README.md index d500cfd..b84a1c1 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ For a more in-depth view of ct and why it exists, take a look at the [Overview][ Please use the [bug tracker][issues] to report bugs. -[ignition]: https://github.com/flatcar-linux/ignition -[issues]: https://github.com/flatcar-linux/flatcar/issues +[ignition]: https://github.com/flatcar/ignition +[issues]: https://github.com/flatcar/flatcar/issues [overview]: doc/overview.md [get-started]: doc/getting-started.md [config]: doc/configuration.md @@ -54,7 +54,7 @@ ARCH=x86_64 OS=unknown-linux-gnu # Linux # Specify download URL -DOWNLOAD_URL=https://github.com/flatcar-linux/container-linux-config-transpiler/releases/download +DOWNLOAD_URL=https://github.com/flatcar/container-linux-config-transpiler/releases/download # Remove previous downloads rm -f /tmp/ct-${CT_VER}-${ARCH}-${OS} /tmp/ct-${CT_VER}-${ARCH}-${OS}.asc /tmp/coreos-app-signing-pubkey.gpg @@ -72,14 +72,14 @@ curl -L ${DOWNLOAD_URL}/${CT_VER}/ct-${CT_VER}-${ARCH}-${OS}.asc -o /tmp/ct-${CT gpg2 --verify /tmp/ct-${CT_VER}-${ARCH}-${OS}.asc /tmp/ct-${CT_VER}-${ARCH}-${OS} ``` -[releases]: https://github.com/flatcar-linux/container-linux-config-transpiler/releases +[releases]: https://github.com/flatcar/container-linux-config-transpiler/releases ### Building from source To build from source you'll need to have the go compiler installed on your system. ```shell -git clone --branch v0.8.0 https://github.com/flatcar-linux/container-linux-config-transpiler +git clone --branch v0.8.0 https://github.com/flatcar/container-linux-config-transpiler cd container-linux-config-transpiler make ``` @@ -90,6 +90,6 @@ Note: Review releases for new branch versions. ## Related projects -- [https://github.com/flatcar-linux/ignition](https://github.com/flatcar-linux/ignition) -- [https://github.com/flatcar-linux/afterburn/](https://github.com/flatcar-linux/afterburn) +- [https://github.com/flatcar/ignition](https://github.com/flatcar/ignition) +- [https://github.com/flatcar/afterburn/](https://github.com/flatcar/afterburn) - [https://github.com/poseidon/matchbox](https://github.com/poseidon/matchbox) diff --git a/config/astyaml/astyaml.go b/config/astyaml/astyaml.go index 88aa55b..4b6191e 100644 --- a/config/astyaml/astyaml.go +++ b/config/astyaml/astyaml.go @@ -19,7 +19,7 @@ import ( "io" "strings" - "github.com/flatcar-linux/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/astnode" yaml "gopkg.in/yaml.v3" ) diff --git a/config/config.go b/config/config.go index 03a4239..c86c918 100644 --- a/config/config.go +++ b/config/config.go @@ -17,15 +17,15 @@ package config import ( "reflect" - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" yaml "gopkg.in/yaml.v3" - "github.com/flatcar-linux/container-linux-config-transpiler/config/astyaml" - "github.com/flatcar-linux/container-linux-config-transpiler/config/platform" - "github.com/flatcar-linux/container-linux-config-transpiler/config/types" + "github.com/flatcar/container-linux-config-transpiler/config/astyaml" + "github.com/flatcar/container-linux-config-transpiler/config/platform" + "github.com/flatcar/container-linux-config-transpiler/config/types" ) // Parse will convert a byte slice containing a Container Linux Config into a diff --git a/config/config_test.go b/config/config_test.go index 8ba2e5f..ddb3c75 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/coreos/go-semver/semver" - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/report" - "github.com/flatcar-linux/container-linux-config-transpiler/config/types" - "github.com/flatcar-linux/container-linux-config-transpiler/internal/util" + "github.com/flatcar/container-linux-config-transpiler/config/types" + "github.com/flatcar/container-linux-config-transpiler/internal/util" ) func TestParse(t *testing.T) { diff --git a/config/templating/templating.go b/config/templating/templating.go index 91c58a9..c084880 100644 --- a/config/templating/templating.go +++ b/config/templating/templating.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/flatcar-linux/container-linux-config-transpiler/config/platform" + "github.com/flatcar/container-linux-config-transpiler/config/platform" ) var ( diff --git a/config/types/common.go b/config/types/common.go index a3ea484..1258051 100644 --- a/config/types/common.go +++ b/config/types/common.go @@ -19,14 +19,14 @@ import ( "fmt" "reflect" - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" - - "github.com/flatcar-linux/container-linux-config-transpiler/config/platform" - "github.com/flatcar-linux/container-linux-config-transpiler/config/templating" - "github.com/flatcar-linux/container-linux-config-transpiler/config/types/util" - iutil "github.com/flatcar-linux/container-linux-config-transpiler/internal/util" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" + + "github.com/flatcar/container-linux-config-transpiler/config/platform" + "github.com/flatcar/container-linux-config-transpiler/config/templating" + "github.com/flatcar/container-linux-config-transpiler/config/types/util" + iutil "github.com/flatcar/container-linux-config-transpiler/internal/util" ) var ( diff --git a/config/types/config.go b/config/types/config.go index d0f94f5..ab382c8 100644 --- a/config/types/config.go +++ b/config/types/config.go @@ -18,9 +18,9 @@ import ( "errors" "net/url" - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) var ( diff --git a/config/types/converter.go b/config/types/converter.go index 9fecca4..6319fa2 100644 --- a/config/types/converter.go +++ b/config/types/converter.go @@ -17,12 +17,12 @@ package types import ( "reflect" - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" - "github.com/flatcar-linux/container-linux-config-transpiler/config/astyaml" + "github.com/flatcar/container-linux-config-transpiler/config/astyaml" ) type converter func(in Config, ast astnode.AstNode, out ignTypes.Config, platform string) (ignTypes.Config, report.Report, astnode.AstNode) diff --git a/config/types/disks.go b/config/types/disks.go index 81a5679..f67b6b0 100644 --- a/config/types/disks.go +++ b/config/types/disks.go @@ -18,9 +18,9 @@ import ( "fmt" "github.com/alecthomas/units" - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) const ( diff --git a/config/types/docker.go b/config/types/docker.go index 244304d..364b81c 100644 --- a/config/types/docker.go +++ b/config/types/docker.go @@ -18,9 +18,9 @@ import ( "fmt" "strings" - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) type Docker struct { diff --git a/config/types/etcd.go b/config/types/etcd.go index 4d7cf5e..e538f91 100644 --- a/config/types/etcd.go +++ b/config/types/etcd.go @@ -19,9 +19,9 @@ import ( "fmt" "github.com/coreos/go-semver/semver" - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) var ( diff --git a/config/types/files.go b/config/types/files.go index eaa0403..e38dbb5 100644 --- a/config/types/files.go +++ b/config/types/files.go @@ -22,12 +22,12 @@ import ( "net/url" "path" - "github.com/flatcar-linux/container-linux-config-transpiler/config/astyaml" - "github.com/flatcar-linux/container-linux-config-transpiler/internal/util" + "github.com/flatcar/container-linux-config-transpiler/config/astyaml" + "github.com/flatcar/container-linux-config-transpiler/internal/util" - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" "github.com/vincent-petithory/dataurl" ) diff --git a/config/types/filesystems.go b/config/types/filesystems.go index 24cbe5b..fc68f8a 100644 --- a/config/types/filesystems.go +++ b/config/types/filesystems.go @@ -15,9 +15,9 @@ package types import ( - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) type Filesystem struct { diff --git a/config/types/flannel.go b/config/types/flannel.go index 3e69a4b..8bf536d 100644 --- a/config/types/flannel.go +++ b/config/types/flannel.go @@ -6,9 +6,9 @@ import ( "fmt" "github.com/coreos/go-semver/semver" - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) var ( diff --git a/config/types/locksmith.go b/config/types/locksmith.go index d333ec9..e2f9694 100644 --- a/config/types/locksmith.go +++ b/config/types/locksmith.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/validate/report" ) var ( diff --git a/config/types/locksmith_test.go b/config/types/locksmith_test.go index 3fca8e6..45b0018 100644 --- a/config/types/locksmith_test.go +++ b/config/types/locksmith_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/validate/report" ) func TestValidateWindowStart(t *testing.T) { diff --git a/config/types/networkd.go b/config/types/networkd.go index 0673100..2b32642 100644 --- a/config/types/networkd.go +++ b/config/types/networkd.go @@ -15,9 +15,9 @@ package types import ( - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) type Networkd struct { diff --git a/config/types/passwd.go b/config/types/passwd.go index 7cbd99e..17ca6ca 100644 --- a/config/types/passwd.go +++ b/config/types/passwd.go @@ -15,9 +15,9 @@ package types import ( - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) type Passwd struct { diff --git a/config/types/raid.go b/config/types/raid.go index dd55022..7b5b11b 100644 --- a/config/types/raid.go +++ b/config/types/raid.go @@ -15,9 +15,9 @@ package types import ( - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) type Raid struct { diff --git a/config/types/security.go b/config/types/security.go index ff7e126..a2d5fee 100644 --- a/config/types/security.go +++ b/config/types/security.go @@ -15,9 +15,9 @@ package types import ( - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) type Security struct { diff --git a/config/types/systemd.go b/config/types/systemd.go index 04d2ebe..853c833 100644 --- a/config/types/systemd.go +++ b/config/types/systemd.go @@ -15,9 +15,9 @@ package types import ( - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) type Systemd struct { diff --git a/config/types/update.go b/config/types/update.go index a42f773..fe8c82c 100644 --- a/config/types/update.go +++ b/config/types/update.go @@ -20,11 +20,11 @@ import ( "net/url" "strings" - "github.com/flatcar-linux/container-linux-config-transpiler/internal/util" + "github.com/flatcar/container-linux-config-transpiler/internal/util" - ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + ignTypes "github.com/flatcar/ignition/config/v2_3/types" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" "github.com/vincent-petithory/dataurl" ) diff --git a/config/types/update_test.go b/config/types/update_test.go index 053ca32..5c67130 100644 --- a/config/types/update_test.go +++ b/config/types/update_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/validate/report" ) func TestValidateUpdateGroup(t *testing.T) { diff --git a/doc/configuration.md b/doc/configuration.md index e39c922..ee9aa7c 100644 --- a/doc/configuration.md +++ b/doc/configuration.md @@ -176,4 +176,4 @@ _Note: all fields are optional unless otherwise marked_ [part-types]: http://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs [rfc2397]: https://tools.ietf.org/html/rfc2397 -[ignition-fs-reuse]: https://github.com/flatcar-linux/ignition/blob/master/doc/operator-notes.md#filesystem-reuse-semantics +[ignition-fs-reuse]: https://github.com/flatcar/ignition/blob/master/doc/operator-notes.md#filesystem-reuse-semantics diff --git a/doc/getting-started.md b/doc/getting-started.md index f563c34..c123ba9 100644 --- a/doc/getting-started.md +++ b/doc/getting-started.md @@ -34,4 +34,4 @@ To see some examples for what else ct can do, head over to the [examples][3]. [1]: configuration.md [2]: https://coreos.com/ignition/docs/latest/supported-platforms.html [3]: examples.md -[4]: https://github.com/flatcar-linux/container-linux-config-transpiler/releases +[4]: https://github.com/flatcar/container-linux-config-transpiler/releases diff --git a/doc/overview.md b/doc/overview.md index e3fe40d..4e825ce 100644 --- a/doc/overview.md +++ b/doc/overview.md @@ -6,8 +6,8 @@ The Container Linux Config is intended to be human-friendly, and is thus in YAML The resulting Ignition config is very much not intended to be human-friendly. It is an artifact produced by ct that users should simply pass along to their machines. JSON was chosen over a binary format to make the process more transparent and to allow power users to inspect/modify what ct produces, but it would have worked fine if the result from ct had not been human readable at all. -[ct]: https://github.com/flatcar-linux/container-linux-config-transpiler/ -[ignition]: https://github.com/flatcar-linux/ignition +[ct]: https://github.com/flatcar/container-linux-config-transpiler/ +[ignition]: https://github.com/flatcar/ignition ## Why a two-step process? diff --git a/docker-build b/docker-build index 9bec563..ccabaf1 100755 --- a/docker-build +++ b/docker-build @@ -2,5 +2,5 @@ set -e VERSION=$(git describe) -docker build --tag ghcr.io/flatcar-linux/ct:$VERSION . -docker tag ghcr.io/flatcar-linux/ct:$VERSION ghcr.io/flatcar-linux/ct:latest-dev +docker build --tag ghcr.io/flatcar/ct:$VERSION . +docker tag ghcr.io/flatcar/ct:$VERSION ghcr.io/flatcar/ct:latest-dev diff --git a/docker-push b/docker-push index b06c66b..3a3ff53 100755 --- a/docker-push +++ b/docker-push @@ -2,5 +2,5 @@ set -e VERSION=$(git describe) -docker push ghcr.io/flatcar-linux/ct:$VERSION -docker push ghcr.io/flatcar-linux/ct:latest-dev +docker push ghcr.io/flatcar/ct:$VERSION +docker push ghcr.io/flatcar/ct:latest-dev diff --git a/go.mod b/go.mod index b84ab1a..82f38ef 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/flatcar-linux/container-linux-config-transpiler +module github.com/flatcar/container-linux-config-transpiler go 1.16 @@ -8,7 +8,7 @@ require ( github.com/coreos/go-semver v0.3.0 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/flatcar-linux/ignition v0.36.1 + github.com/flatcar/ignition v0.36.2 github.com/stretchr/testify v1.7.0 github.com/vincent-petithory/dataurl v1.0.0 go4.org v0.0.0-20201209231011-d4a079459e60 // indirect diff --git a/go.sum b/go.sum index a6c1d0c..41f0ae2 100644 --- a/go.sum +++ b/go.sum @@ -39,8 +39,8 @@ 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/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/flatcar-linux/ignition v0.36.1 h1:yNvS9sQvm9HJ8VgxXskx88DsF73qdF35ALJkbTwcYhY= -github.com/flatcar-linux/ignition v0.36.1/go.mod h1:0jS5n4AopgOdwgi7QDo5MFgkMx/fQUDYjuxlGJC1Txg= +github.com/flatcar/ignition v0.36.2 h1:xGHgScUe0P4Fkprjqv7L2CE58emiQgP833OCCn9z2v4= +github.com/flatcar/ignition v0.36.2/go.mod h1:uk1tpzLFRXus4RrvzgMI+IqmmB8a/RGFSBlI+tMTbbA= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= @@ -181,8 +181,8 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20190321115727-fe223c5a2583/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/internal/main.go b/internal/main.go index 6628dd6..d2435a0 100644 --- a/internal/main.go +++ b/internal/main.go @@ -22,9 +22,9 @@ import ( "os" "strings" - "github.com/flatcar-linux/container-linux-config-transpiler/config" - "github.com/flatcar-linux/container-linux-config-transpiler/config/platform" - "github.com/flatcar-linux/container-linux-config-transpiler/internal/version" + "github.com/flatcar/container-linux-config-transpiler/config" + "github.com/flatcar/container-linux-config-transpiler/config/platform" + "github.com/flatcar/container-linux-config-transpiler/internal/version" ) func stderr(f string, a ...interface{}) { diff --git a/internal/util/tools/docs.go b/internal/util/tools/docs.go index baeb530..623297f 100644 --- a/internal/util/tools/docs.go +++ b/internal/util/tools/docs.go @@ -25,7 +25,7 @@ import ( "path/filepath" "strings" - "github.com/flatcar-linux/container-linux-config-transpiler/config" + "github.com/flatcar/container-linux-config-transpiler/config" ) const ( diff --git a/release.sh b/release.sh index 38ec2ab..0417c6a 100755 --- a/release.sh +++ b/release.sh @@ -12,7 +12,7 @@ VER=$1 } if test -n "$(git ls-files --others | \ - grep --invert-match '\(gopath/src/github.com/flatcar-linux/container-linux-config-transpiler\|bin/ct\)')"; + grep --invert-match '\(gopath/src/github.com/flatcar/container-linux-config-transpiler\|bin/ct\)')"; then echo "directory has untracked files" exit 1 diff --git a/test b/test index e67e6cf..95e31d5 100755 --- a/test +++ b/test @@ -2,7 +2,7 @@ set -eu -ORG_PATH="github.com/flatcar-linux" +ORG_PATH="github.com/flatcar" REPO_PATH="${ORG_PATH}/container-linux-config-transpiler" if [ ! -h gopath/src/${REPO_PATH} ]; then diff --git a/vendor/github.com/flatcar-linux/ignition/LICENSE b/vendor/github.com/flatcar/ignition/LICENSE similarity index 100% rename from vendor/github.com/flatcar-linux/ignition/LICENSE rename to vendor/github.com/flatcar/ignition/LICENSE diff --git a/vendor/github.com/flatcar-linux/ignition/NOTICE b/vendor/github.com/flatcar/ignition/NOTICE similarity index 100% rename from vendor/github.com/flatcar-linux/ignition/NOTICE rename to vendor/github.com/flatcar/ignition/NOTICE diff --git a/vendor/github.com/flatcar-linux/ignition/config/shared/errors/errors.go b/vendor/github.com/flatcar/ignition/config/shared/errors/errors.go similarity index 89% rename from vendor/github.com/flatcar-linux/ignition/config/shared/errors/errors.go rename to vendor/github.com/flatcar/ignition/config/shared/errors/errors.go index 81e8576..f2b47cf 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/shared/errors/errors.go +++ b/vendor/github.com/flatcar/ignition/config/shared/errors/errors.go @@ -88,12 +88,15 @@ var ( ErrInvalidNetworkdDropinExt = errors.New("invalid networkd drop-in extension") // Misc errors - ErrInvalidScheme = errors.New("invalid url scheme") - ErrInvalidUrl = errors.New("unable to parse url") - ErrHashMalformed = errors.New("malformed hash specifier") - ErrHashWrongSize = errors.New("incorrect size for hash sum") - ErrHashUnrecognized = errors.New("unrecognized hash function") - ErrEngineConfiguration = errors.New("engine incorrectly configured") + ErrInvalidScheme = errors.New("invalid url scheme") + ErrInvalidUrl = errors.New("unable to parse url") + ErrEmptyHTTPHeaderName = errors.New("HTTP header name can't be empty") + ErrDuplicateHTTPHeaders = errors.New("all header names in the list must be unique") + ErrUnsupportedSchemeForHTTPHeaders = errors.New("cannot use HTTP headers with this source scheme") + ErrHashMalformed = errors.New("malformed hash specifier") + ErrHashWrongSize = errors.New("incorrect size for hash sum") + ErrHashUnrecognized = errors.New("unrecognized hash function") + ErrEngineConfiguration = errors.New("engine incorrectly configured") // AWS S3 specific errors ErrInvalidS3ObjectVersionId = errors.New("invalid S3 object VersionId") diff --git a/vendor/github.com/flatcar-linux/ignition/config/shared/validations/unit.go b/vendor/github.com/flatcar/ignition/config/shared/validations/unit.go similarity index 93% rename from vendor/github.com/flatcar-linux/ignition/config/shared/validations/unit.go rename to vendor/github.com/flatcar/ignition/config/shared/validations/unit.go index 383a2c6..a7061dc 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/shared/validations/unit.go +++ b/vendor/github.com/flatcar/ignition/config/shared/validations/unit.go @@ -18,8 +18,8 @@ package validations import ( "github.com/coreos/go-systemd/unit" - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/validate/report" ) // ValidateInstallSection is a helper to validate a given unit diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ca.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/ca.go similarity index 93% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ca.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/ca.go index d5045ff..313b3ad 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ca.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/ca.go @@ -15,7 +15,7 @@ package types import ( - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/validate/report" ) func (c CaReference) ValidateSource() report.Report { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/config.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/config.go similarity index 97% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/config.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/config.go index 8067cc0..0247fcc 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/config.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/config.go @@ -19,7 +19,7 @@ import ( "github.com/coreos/go-semver/semver" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/validate/report" ) var ( diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/directory.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/directory.go similarity index 89% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/directory.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/directory.go index a86fefc..50ded7d 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/directory.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/directory.go @@ -15,8 +15,8 @@ package types import ( - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/validate/report" ) func (d Directory) ValidateMode() report.Report { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/disk.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/disk.go similarity index 97% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/disk.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/disk.go index 67cab98..9af1ca1 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/disk.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/disk.go @@ -15,8 +15,8 @@ package types import ( - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/validate/report" ) func (n Disk) Validate() report.Report { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/file.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/file.go similarity index 93% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/file.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/file.go index 6e2a0c7..b59d08c 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/file.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/file.go @@ -17,8 +17,8 @@ package types import ( "fmt" - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/validate/report" ) func (f File) Validate() report.Report { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/filesystem.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/filesystem.go similarity index 96% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/filesystem.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/filesystem.go index ccc7166..9226e37 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/filesystem.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/filesystem.go @@ -17,8 +17,8 @@ package types import ( "fmt" - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/validate/report" ) func (f Filesystem) Validate() report.Report { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ignition.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/ignition.go similarity index 92% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ignition.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/ignition.go index 513012e..e7a0d52 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ignition.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/ignition.go @@ -17,8 +17,8 @@ package types import ( "github.com/coreos/go-semver/semver" - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/validate/report" ) func (c ConfigReference) ValidateSource() report.Report { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/mode.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/mode.go similarity index 92% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/mode.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/mode.go index e0a0491..b746217 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/mode.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/mode.go @@ -15,7 +15,7 @@ package types import ( - "github.com/flatcar-linux/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/shared/errors" ) func validateMode(m *int) error { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/node.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/node.go similarity index 93% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/node.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/node.go index e6071e9..dd0489c 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/node.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/node.go @@ -17,8 +17,8 @@ package types import ( "path/filepath" - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/validate/report" ) func (n Node) ValidateFilesystem() report.Report { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/partition.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/partition.go similarity index 96% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/partition.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/partition.go index e2b0736..99a993e 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/partition.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/partition.go @@ -19,8 +19,8 @@ import ( "regexp" "strings" - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/validate/report" ) const ( diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/passwd.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/passwd.go similarity index 93% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/passwd.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/passwd.go index 5ca0318..095ddc5 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/passwd.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/passwd.go @@ -15,8 +15,8 @@ package types import ( - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/validate/report" ) func (p PasswdUser) Validate() report.Report { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/path.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/path.go similarity index 92% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/path.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/path.go index a478fd3..f52ec95 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/path.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/path.go @@ -17,7 +17,7 @@ package types import ( "path" - "github.com/flatcar-linux/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/shared/errors" ) func validatePath(p string) error { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/raid.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/raid.go similarity index 92% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/raid.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/raid.go index d2b49fc..87a10ee 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/raid.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/raid.go @@ -15,8 +15,8 @@ package types import ( - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/validate/report" ) func (n Raid) ValidateLevel() report.Report { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/schema.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/schema.go similarity index 100% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/schema.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/schema.go diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/unit.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/unit.go similarity index 94% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/unit.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/unit.go index 7911c92..3d57428 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/unit.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/unit.go @@ -21,9 +21,9 @@ import ( "github.com/coreos/go-systemd/unit" - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/shared/validations" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/shared/validations" + "github.com/flatcar/ignition/config/validate/report" ) func (u Unit) ValidateContents() report.Report { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/url.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/url.go similarity index 95% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/url.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/url.go index 6d25e80..aedd9a5 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/url.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/url.go @@ -19,7 +19,7 @@ import ( "github.com/vincent-petithory/dataurl" - "github.com/flatcar-linux/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/shared/errors" ) func validateURL(s string) error { diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/verification.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/verification.go similarity index 93% rename from vendor/github.com/flatcar-linux/ignition/config/v2_3/types/verification.go rename to vendor/github.com/flatcar/ignition/config/v2_3/types/verification.go index 6f77de2..cb06d76 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/verification.go +++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/verification.go @@ -19,8 +19,8 @@ import ( "encoding/hex" "strings" - "github.com/flatcar-linux/ignition/config/shared/errors" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/shared/errors" + "github.com/flatcar/ignition/config/validate/report" ) // HashParts will return the sum and function (in that order) of the hash stored diff --git a/vendor/github.com/flatcar-linux/ignition/config/validate/astjson/node.go b/vendor/github.com/flatcar/ignition/config/validate/astjson/node.go similarity index 97% rename from vendor/github.com/flatcar-linux/ignition/config/validate/astjson/node.go rename to vendor/github.com/flatcar/ignition/config/validate/astjson/node.go index 40f24a7..9875cfd 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/validate/astjson/node.go +++ b/vendor/github.com/flatcar/ignition/config/validate/astjson/node.go @@ -18,7 +18,7 @@ import ( "io" json "github.com/ajeddeloh/go-json" - "github.com/flatcar-linux/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/astnode" "go4.org/errorutil" ) diff --git a/vendor/github.com/flatcar-linux/ignition/config/validate/astnode/astnode.go b/vendor/github.com/flatcar/ignition/config/validate/astnode/astnode.go similarity index 100% rename from vendor/github.com/flatcar-linux/ignition/config/validate/astnode/astnode.go rename to vendor/github.com/flatcar/ignition/config/validate/astnode/astnode.go diff --git a/vendor/github.com/flatcar-linux/ignition/config/validate/report/report.go b/vendor/github.com/flatcar/ignition/config/validate/report/report.go similarity index 100% rename from vendor/github.com/flatcar-linux/ignition/config/validate/report/report.go rename to vendor/github.com/flatcar/ignition/config/validate/report/report.go diff --git a/vendor/github.com/flatcar-linux/ignition/config/validate/validate.go b/vendor/github.com/flatcar/ignition/config/validate/validate.go similarity index 97% rename from vendor/github.com/flatcar-linux/ignition/config/validate/validate.go rename to vendor/github.com/flatcar/ignition/config/validate/validate.go index 54c036e..3363f8d 100644 --- a/vendor/github.com/flatcar-linux/ignition/config/validate/validate.go +++ b/vendor/github.com/flatcar/ignition/config/validate/validate.go @@ -22,9 +22,9 @@ import ( "strings" json "github.com/ajeddeloh/go-json" - "github.com/flatcar-linux/ignition/config/validate/astjson" - "github.com/flatcar-linux/ignition/config/validate/astnode" - "github.com/flatcar-linux/ignition/config/validate/report" + "github.com/flatcar/ignition/config/validate/astjson" + "github.com/flatcar/ignition/config/validate/astnode" + "github.com/flatcar/ignition/config/validate/report" ) type validator interface { diff --git a/vendor/modules.txt b/vendor/modules.txt index f7b1766..3fb416d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -13,15 +13,15 @@ github.com/coreos/go-systemd/unit # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/flatcar-linux/ignition v0.36.1 -## explicit -github.com/flatcar-linux/ignition/config/shared/errors -github.com/flatcar-linux/ignition/config/shared/validations -github.com/flatcar-linux/ignition/config/v2_3/types -github.com/flatcar-linux/ignition/config/validate -github.com/flatcar-linux/ignition/config/validate/astjson -github.com/flatcar-linux/ignition/config/validate/astnode -github.com/flatcar-linux/ignition/config/validate/report +# github.com/flatcar/ignition v0.36.2 +## explicit +github.com/flatcar/ignition/config/shared/errors +github.com/flatcar/ignition/config/shared/validations +github.com/flatcar/ignition/config/v2_3/types +github.com/flatcar/ignition/config/validate +github.com/flatcar/ignition/config/validate/astjson +github.com/flatcar/ignition/config/validate/astnode +github.com/flatcar/ignition/config/validate/report # github.com/pmezard/go-difflib v1.0.0 github.com/pmezard/go-difflib/difflib # github.com/stretchr/testify v1.7.0