From f100629c9fbaf76308be73f2f02293fd0d8dd567 Mon Sep 17 00:00:00 2001 From: Sayan Paul Date: Wed, 6 Sep 2023 19:15:41 +0530 Subject: [PATCH] Renaming r4e config to iot since the configs will be used by both r4e and fedora-iot generic name makes more sense here Signed-off-by: Sayan Paul --- config/config.go | 12 ++++++------ config/{r4e => iot}/v1_0/schema.go | 0 config/{r4e => iot}/v1_0/translate.go | 0 config/{r4e => iot}/v1_0/translate_test.go | 0 config/{r4e => iot}/v1_1/schema.go | 0 config/{r4e => iot}/v1_1/translate.go | 0 config/{r4e => iot}/v1_1/translate_test.go | 0 config/{r4e => iot}/v1_2_exp/schema.go | 0 config/{r4e => iot}/v1_2_exp/translate.go | 0 config/{r4e => iot}/v1_2_exp/translate_test.go | 0 internal/doc/main.go | 12 ++++++------ 11 files changed, 12 insertions(+), 12 deletions(-) rename config/{r4e => iot}/v1_0/schema.go (100%) rename config/{r4e => iot}/v1_0/translate.go (100%) rename config/{r4e => iot}/v1_0/translate_test.go (100%) rename config/{r4e => iot}/v1_1/schema.go (100%) rename config/{r4e => iot}/v1_1/translate.go (100%) rename config/{r4e => iot}/v1_1/translate_test.go (100%) rename config/{r4e => iot}/v1_2_exp/schema.go (100%) rename config/{r4e => iot}/v1_2_exp/translate.go (100%) rename config/{r4e => iot}/v1_2_exp/translate_test.go (100%) diff --git a/config/config.go b/config/config.go index 7d1c02a8..e2baf0fc 100644 --- a/config/config.go +++ b/config/config.go @@ -28,6 +28,9 @@ import ( flatcar1_0 "github.com/coreos/butane/config/flatcar/v1_0" flatcar1_1 "github.com/coreos/butane/config/flatcar/v1_1" flatcar1_2_exp "github.com/coreos/butane/config/flatcar/v1_2_exp" + iot1_0 "github.com/coreos/butane/config/iot/v1_0" + iot1_1 "github.com/coreos/butane/config/iot/v1_1" + iot1_2_exp "github.com/coreos/butane/config/iot/v1_2_exp" openshift4_10 "github.com/coreos/butane/config/openshift/v4_10" openshift4_11 "github.com/coreos/butane/config/openshift/v4_11" openshift4_12 "github.com/coreos/butane/config/openshift/v4_12" @@ -35,9 +38,6 @@ import ( openshift4_14_exp "github.com/coreos/butane/config/openshift/v4_14_exp" openshift4_8 "github.com/coreos/butane/config/openshift/v4_8" openshift4_9 "github.com/coreos/butane/config/openshift/v4_9" - r4e1_0 "github.com/coreos/butane/config/r4e/v1_0" - r4e1_1 "github.com/coreos/butane/config/r4e/v1_1" - r4e1_2_exp "github.com/coreos/butane/config/r4e/v1_2_exp" "github.com/coreos/go-semver/semver" "github.com/coreos/vcontext/report" @@ -72,9 +72,9 @@ func init() { RegisterTranslator("openshift", "4.12.0", openshift4_12.ToConfigBytes) RegisterTranslator("openshift", "4.13.0", openshift4_13.ToConfigBytes) RegisterTranslator("openshift", "4.14.0-experimental", openshift4_14_exp.ToConfigBytes) - RegisterTranslator("r4e", "1.0.0", r4e1_0.ToIgn3_3Bytes) - RegisterTranslator("r4e", "1.1.0", r4e1_1.ToIgn3_4Bytes) - RegisterTranslator("r4e", "1.2.0-experimental", r4e1_2_exp.ToIgn3_5Bytes) + RegisterTranslator("r4e", "1.0.0", iot1_0.ToIgn3_3Bytes) + RegisterTranslator("r4e", "1.1.0", iot1_1.ToIgn3_4Bytes) + RegisterTranslator("r4e", "1.2.0-experimental", iot1_2_exp.ToIgn3_5Bytes) RegisterTranslator("rhcos", "0.1.0", unsupportedRhcosVariant) } diff --git a/config/r4e/v1_0/schema.go b/config/iot/v1_0/schema.go similarity index 100% rename from config/r4e/v1_0/schema.go rename to config/iot/v1_0/schema.go diff --git a/config/r4e/v1_0/translate.go b/config/iot/v1_0/translate.go similarity index 100% rename from config/r4e/v1_0/translate.go rename to config/iot/v1_0/translate.go diff --git a/config/r4e/v1_0/translate_test.go b/config/iot/v1_0/translate_test.go similarity index 100% rename from config/r4e/v1_0/translate_test.go rename to config/iot/v1_0/translate_test.go diff --git a/config/r4e/v1_1/schema.go b/config/iot/v1_1/schema.go similarity index 100% rename from config/r4e/v1_1/schema.go rename to config/iot/v1_1/schema.go diff --git a/config/r4e/v1_1/translate.go b/config/iot/v1_1/translate.go similarity index 100% rename from config/r4e/v1_1/translate.go rename to config/iot/v1_1/translate.go diff --git a/config/r4e/v1_1/translate_test.go b/config/iot/v1_1/translate_test.go similarity index 100% rename from config/r4e/v1_1/translate_test.go rename to config/iot/v1_1/translate_test.go diff --git a/config/r4e/v1_2_exp/schema.go b/config/iot/v1_2_exp/schema.go similarity index 100% rename from config/r4e/v1_2_exp/schema.go rename to config/iot/v1_2_exp/schema.go diff --git a/config/r4e/v1_2_exp/translate.go b/config/iot/v1_2_exp/translate.go similarity index 100% rename from config/r4e/v1_2_exp/translate.go rename to config/iot/v1_2_exp/translate.go diff --git a/config/r4e/v1_2_exp/translate_test.go b/config/iot/v1_2_exp/translate_test.go similarity index 100% rename from config/r4e/v1_2_exp/translate_test.go rename to config/iot/v1_2_exp/translate_test.go diff --git a/internal/doc/main.go b/internal/doc/main.go index 31d8f5de..426da317 100644 --- a/internal/doc/main.go +++ b/internal/doc/main.go @@ -45,6 +45,9 @@ import ( flatcar1_0 "github.com/coreos/butane/config/flatcar/v1_0" flatcar1_1 "github.com/coreos/butane/config/flatcar/v1_1" flatcar1_2_exp "github.com/coreos/butane/config/flatcar/v1_2_exp" + iot1_0 "github.com/coreos/butane/config/iot/v1_0" + iot1_1 "github.com/coreos/butane/config/iot/v1_1" + iot1_2_exp "github.com/coreos/butane/config/iot/v1_2_exp" openshift4_10 "github.com/coreos/butane/config/openshift/v4_10" openshift4_11 "github.com/coreos/butane/config/openshift/v4_11" openshift4_12 "github.com/coreos/butane/config/openshift/v4_12" @@ -52,9 +55,6 @@ import ( openshift4_14_exp "github.com/coreos/butane/config/openshift/v4_14_exp" openshift4_8 "github.com/coreos/butane/config/openshift/v4_8" openshift4_9 "github.com/coreos/butane/config/openshift/v4_9" - r4e1_0 "github.com/coreos/butane/config/r4e/v1_0" - r4e1_1 "github.com/coreos/butane/config/r4e/v1_1" - r4e1_2_exp "github.com/coreos/butane/config/r4e/v1_2_exp" ) var ( @@ -134,9 +134,9 @@ func generate(dir string) error { "r4e", []version{ // inverse order of website navbar - {"1.2.0-experimental", r4e1_2_exp.Config{}}, - {"1.0.0", r4e1_0.Config{}}, - {"1.1.0", r4e1_1.Config{}}, + {"1.2.0-experimental", iot1_2_exp.Config{}}, + {"1.0.0", iot1_0.Config{}}, + {"1.1.0", iot1_1.Config{}}, }, }, }