From 7461902fd90278c1fa7a48ac6d27a5997b7825d9 Mon Sep 17 00:00:00 2001 From: "jesus m. rodriguez" Date: Thu, 22 Apr 2021 14:28:39 -0400 Subject: [PATCH] Rename to v1alpha Signed-off-by: jesus m. rodriguez --- README.md | 2 +- pkg/quarkus/{v1 => v1alpha}/api.go | 2 +- pkg/quarkus/{v1 => v1alpha}/init.go | 2 +- pkg/quarkus/{v1 => v1alpha}/plugin.go | 3 ++- pkg/quarkus/{v1 => v1alpha}/scaffolds/api.go | 6 +++--- pkg/quarkus/{v1 => v1alpha}/scaffolds/doc.go | 0 pkg/quarkus/{v1 => v1alpha}/scaffolds/init.go | 4 ++-- .../scaffolds/internal/templates/applicationproperties.go | 2 +- .../scaffolds/internal/templates/controller/controller.go | 2 +- .../{v1 => v1alpha}/scaffolds/internal/templates/doc.go | 0 .../scaffolds/internal/templates/gitignore.go | 0 .../scaffolds/internal/templates/model/model.go | 2 +- .../scaffolds/internal/templates/model/modelspec.go | 2 +- .../scaffolds/internal/templates/model/modelstatus.go | 2 +- .../scaffolds/internal/templates/operatorfile.go | 2 +- .../{v1 => v1alpha}/scaffolds/internal/templates/pomxml.go | 0 .../scaffolds/internal/templates/util/file.go | 0 pkg/quarkus/{v1 => v1alpha}/util/util.go | 0 pkg/quarkus/{v1 => v1alpha}/util/util_suite_test.go | 0 pkg/quarkus/{v1 => v1alpha}/util/util_test.go | 0 20 files changed, 16 insertions(+), 15 deletions(-) rename pkg/quarkus/{v1 => v1alpha}/api.go (99%) rename pkg/quarkus/{v1 => v1alpha}/init.go (99%) rename pkg/quarkus/{v1 => v1alpha}/plugin.go (95%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/api.go (95%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/doc.go (100%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/init.go (96%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/internal/templates/applicationproperties.go (94%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/internal/templates/controller/controller.go (98%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/internal/templates/doc.go (100%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/internal/templates/gitignore.go (100%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/internal/templates/model/model.go (96%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/internal/templates/model/modelspec.go (94%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/internal/templates/model/modelstatus.go (94%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/internal/templates/operatorfile.go (97%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/internal/templates/pomxml.go (100%) rename pkg/quarkus/{v1 => v1alpha}/scaffolds/internal/templates/util/file.go (100%) rename pkg/quarkus/{v1 => v1alpha}/util/util.go (100%) rename pkg/quarkus/{v1 => v1alpha}/util/util_suite_test.go (100%) rename pkg/quarkus/{v1 => v1alpha}/util/util_test.go (100%) diff --git a/README.md b/README.md index 44d99fc..b97bdf0 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ github.com/operator-framework/java-operator-plugins => /Users/sushah/go/src/gith - Add the java-operator-sdk import ``` -quarkusv1 "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1" +quarkusv1 "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha" ``` - Introduce the java bundle in `GetPluginsCLIAndRoot()` method. diff --git a/pkg/quarkus/v1/api.go b/pkg/quarkus/v1alpha/api.go similarity index 99% rename from pkg/quarkus/v1/api.go rename to pkg/quarkus/v1alpha/api.go index b542eac..9d0cf84 100644 --- a/pkg/quarkus/v1/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/plugin" pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/scaffolds" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds" ) type createAPIOptions struct { diff --git a/pkg/quarkus/v1/init.go b/pkg/quarkus/v1alpha/init.go similarity index 99% rename from pkg/quarkus/v1/init.go rename to pkg/quarkus/v1alpha/init.go index da03dff..494a461 100644 --- a/pkg/quarkus/v1/init.go +++ b/pkg/quarkus/v1alpha/init.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/scaffolds" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds" "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/util/validation" diff --git a/pkg/quarkus/v1/plugin.go b/pkg/quarkus/v1alpha/plugin.go similarity index 95% rename from pkg/quarkus/v1/plugin.go rename to pkg/quarkus/v1alpha/plugin.go index 6c0a86e..7702e5c 100644 --- a/pkg/quarkus/v1/plugin.go +++ b/pkg/quarkus/v1alpha/plugin.go @@ -19,6 +19,7 @@ package v1 import ( "sigs.k8s.io/kubebuilder/v3/pkg/config" v3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" ) @@ -26,7 +27,7 @@ const pluginName = "quarkus.javaoperatorsdk.io" var ( supportedProjectVersions = []config.Version{v3.Version} - pluginVersion = plugin.Version{Number: 1} + pluginVersion = plugin.Version{Number: 1, Stage: stage.Alpha} ) var ( diff --git a/pkg/quarkus/v1/scaffolds/api.go b/pkg/quarkus/v1alpha/scaffolds/api.go similarity index 95% rename from pkg/quarkus/v1/scaffolds/api.go rename to pkg/quarkus/v1alpha/scaffolds/api.go index ffb35aa..147e472 100644 --- a/pkg/quarkus/v1/scaffolds/api.go +++ b/pkg/quarkus/v1alpha/scaffolds/api.go @@ -8,9 +8,9 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/scaffolds/internal/templates/controller" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/scaffolds/internal/templates/model" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/controller" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/model" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/util" ) type apiScaffolder struct { diff --git a/pkg/quarkus/v1/scaffolds/doc.go b/pkg/quarkus/v1alpha/scaffolds/doc.go similarity index 100% rename from pkg/quarkus/v1/scaffolds/doc.go rename to pkg/quarkus/v1alpha/scaffolds/doc.go diff --git a/pkg/quarkus/v1/scaffolds/init.go b/pkg/quarkus/v1alpha/scaffolds/init.go similarity index 96% rename from pkg/quarkus/v1/scaffolds/init.go rename to pkg/quarkus/v1alpha/scaffolds/init.go index 5a91907..5eb6860 100644 --- a/pkg/quarkus/v1/scaffolds/init.go +++ b/pkg/quarkus/v1alpha/scaffolds/init.go @@ -1,11 +1,11 @@ package scaffolds import ( - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/util" "sigs.k8s.io/kubebuilder/v3/pkg/config" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/scaffolds/internal/templates" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates" "sigs.k8s.io/kubebuilder/v3/pkg/plugins" ) diff --git a/pkg/quarkus/v1/scaffolds/internal/templates/applicationproperties.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go similarity index 94% rename from pkg/quarkus/v1/scaffolds/internal/templates/applicationproperties.go rename to pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go index 1e975a1..ee947d6 100644 --- a/pkg/quarkus/v1/scaffolds/internal/templates/applicationproperties.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go @@ -5,7 +5,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" ) var _ machinery.Template = &ApplicationPropertiesFile{} diff --git a/pkg/quarkus/v1/scaffolds/internal/templates/controller/controller.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/controller/controller.go similarity index 98% rename from pkg/quarkus/v1/scaffolds/internal/templates/controller/controller.go rename to pkg/quarkus/v1alpha/scaffolds/internal/templates/controller/controller.go index 975d467..8a09613 100644 --- a/pkg/quarkus/v1/scaffolds/internal/templates/controller/controller.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/controller/controller.go @@ -5,7 +5,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" ) var _ machinery.Template = &Controller{} diff --git a/pkg/quarkus/v1/scaffolds/internal/templates/doc.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/doc.go similarity index 100% rename from pkg/quarkus/v1/scaffolds/internal/templates/doc.go rename to pkg/quarkus/v1alpha/scaffolds/internal/templates/doc.go diff --git a/pkg/quarkus/v1/scaffolds/internal/templates/gitignore.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/gitignore.go similarity index 100% rename from pkg/quarkus/v1/scaffolds/internal/templates/gitignore.go rename to pkg/quarkus/v1alpha/scaffolds/internal/templates/gitignore.go diff --git a/pkg/quarkus/v1/scaffolds/internal/templates/model/model.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/model.go similarity index 96% rename from pkg/quarkus/v1/scaffolds/internal/templates/model/model.go rename to pkg/quarkus/v1alpha/scaffolds/internal/templates/model/model.go index 4f8f479..c8f837a 100644 --- a/pkg/quarkus/v1/scaffolds/internal/templates/model/model.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/model.go @@ -5,7 +5,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" ) var _ machinery.Template = &Model{} diff --git a/pkg/quarkus/v1/scaffolds/internal/templates/model/modelspec.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelspec.go similarity index 94% rename from pkg/quarkus/v1/scaffolds/internal/templates/model/modelspec.go rename to pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelspec.go index f344944..af457a1 100644 --- a/pkg/quarkus/v1/scaffolds/internal/templates/model/modelspec.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelspec.go @@ -5,7 +5,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" ) var _ machinery.Template = &ModelSpec{} diff --git a/pkg/quarkus/v1/scaffolds/internal/templates/model/modelstatus.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelstatus.go similarity index 94% rename from pkg/quarkus/v1/scaffolds/internal/templates/model/modelstatus.go rename to pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelstatus.go index 1ccf85a..2a7e8ae 100644 --- a/pkg/quarkus/v1/scaffolds/internal/templates/model/modelstatus.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelstatus.go @@ -3,7 +3,7 @@ package model import ( "fmt" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) diff --git a/pkg/quarkus/v1/scaffolds/internal/templates/operatorfile.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/operatorfile.go similarity index 97% rename from pkg/quarkus/v1/scaffolds/internal/templates/operatorfile.go rename to pkg/quarkus/v1alpha/scaffolds/internal/templates/operatorfile.go index a3c4309..47e89e1 100644 --- a/pkg/quarkus/v1/scaffolds/internal/templates/operatorfile.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/operatorfile.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) diff --git a/pkg/quarkus/v1/scaffolds/internal/templates/pomxml.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go similarity index 100% rename from pkg/quarkus/v1/scaffolds/internal/templates/pomxml.go rename to pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go diff --git a/pkg/quarkus/v1/scaffolds/internal/templates/util/file.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/util/file.go similarity index 100% rename from pkg/quarkus/v1/scaffolds/internal/templates/util/file.go rename to pkg/quarkus/v1alpha/scaffolds/internal/templates/util/file.go diff --git a/pkg/quarkus/v1/util/util.go b/pkg/quarkus/v1alpha/util/util.go similarity index 100% rename from pkg/quarkus/v1/util/util.go rename to pkg/quarkus/v1alpha/util/util.go diff --git a/pkg/quarkus/v1/util/util_suite_test.go b/pkg/quarkus/v1alpha/util/util_suite_test.go similarity index 100% rename from pkg/quarkus/v1/util/util_suite_test.go rename to pkg/quarkus/v1alpha/util/util_suite_test.go diff --git a/pkg/quarkus/v1/util/util_test.go b/pkg/quarkus/v1alpha/util/util_test.go similarity index 100% rename from pkg/quarkus/v1/util/util_test.go rename to pkg/quarkus/v1alpha/util/util_test.go