diff --git a/cmd/controller/main.go b/cmd/controller/main.go index acded0e5..471282ab 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -32,10 +32,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" xv1alpha1 "github.com/awslabs/kro/api/v1alpha1" - kroclient "github.com/awslabs/kro/internal/client" resourcegroupctrl "github.com/awslabs/kro/internal/controller/resourcegroup" - "github.com/awslabs/kro/internal/dynamiccontroller" "github.com/awslabs/kro/internal/graph" + kroclient "github.com/awslabs/kro/pkg/client" + "github.com/awslabs/kro/pkg/dynamiccontroller" //+kubebuilder:scaffold:imports ) diff --git a/internal/controller/instance/controller.go b/internal/controller/instance/controller.go index 2ebb8198..cb356975 100644 --- a/internal/controller/instance/controller.go +++ b/internal/controller/instance/controller.go @@ -28,9 +28,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "github.com/awslabs/kro/api/v1alpha1" - kroclient "github.com/awslabs/kro/internal/client" "github.com/awslabs/kro/internal/graph" "github.com/awslabs/kro/internal/metadata" + kroclient "github.com/awslabs/kro/pkg/client" ) // ReconcileConfig holds configuration parameters for the recnociliation process. diff --git a/internal/controller/instance/controller_reconcile.go b/internal/controller/instance/controller_reconcile.go index dcac16b6..eab154b0 100644 --- a/internal/controller/instance/controller_reconcile.go +++ b/internal/controller/instance/controller_reconcile.go @@ -26,8 +26,8 @@ import ( "k8s.io/client-go/dynamic" "github.com/awslabs/kro/internal/metadata" - "github.com/awslabs/kro/internal/requeue" "github.com/awslabs/kro/internal/runtime" + "github.com/awslabs/kro/pkg/requeue" ) // instanceGraphReconciler is responsible for reconciling a single instance and diff --git a/internal/controller/instance/controller_status.go b/internal/controller/instance/controller_status.go index 2f058688..2d15871c 100644 --- a/internal/controller/instance/controller_status.go +++ b/internal/controller/instance/controller_status.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/awslabs/kro/api/v1alpha1" - "github.com/awslabs/kro/internal/requeue" + "github.com/awslabs/kro/pkg/requeue" ) func createCondition(conditionType v1alpha1.ConditionType, status corev1.ConditionStatus, reason, message string, generation int64) map[string]interface{} { diff --git a/internal/controller/resourcegroup/controller.go b/internal/controller/resourcegroup/controller.go index cfa3a098..dc69e119 100644 --- a/internal/controller/resourcegroup/controller.go +++ b/internal/controller/resourcegroup/controller.go @@ -24,10 +24,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/awslabs/kro/api/v1alpha1" - kroclient "github.com/awslabs/kro/internal/client" - "github.com/awslabs/kro/internal/dynamiccontroller" "github.com/awslabs/kro/internal/graph" "github.com/awslabs/kro/internal/metadata" + kroclient "github.com/awslabs/kro/pkg/client" + "github.com/awslabs/kro/pkg/dynamiccontroller" ) //+kubebuilder:rbac:groups=kro.run,resources=resourcegroups,verbs=get;list;watch;create;update;patch;delete diff --git a/internal/controller/resourcegroup/controller_reconcile.go b/internal/controller/resourcegroup/controller_reconcile.go index 2cf14f53..4ad00e5f 100644 --- a/internal/controller/resourcegroup/controller_reconcile.go +++ b/internal/controller/resourcegroup/controller_reconcile.go @@ -24,9 +24,9 @@ import ( "github.com/awslabs/kro/api/v1alpha1" instancectrl "github.com/awslabs/kro/internal/controller/instance" - "github.com/awslabs/kro/internal/dynamiccontroller" "github.com/awslabs/kro/internal/graph" "github.com/awslabs/kro/internal/metadata" + "github.com/awslabs/kro/pkg/dynamiccontroller" ) // reconcileResourceGroup orchestrates the reconciliation of a ResourceGroup by: diff --git a/internal/graph/builder.go b/internal/graph/builder.go index ff508cea..ff913507 100644 --- a/internal/graph/builder.go +++ b/internal/graph/builder.go @@ -29,8 +29,6 @@ import ( "k8s.io/client-go/rest" "github.com/awslabs/kro/api/v1alpha1" - krocel "github.com/awslabs/kro/internal/cel" - "github.com/awslabs/kro/internal/cel/ast" "github.com/awslabs/kro/internal/graph/crd" "github.com/awslabs/kro/internal/graph/dag" "github.com/awslabs/kro/internal/graph/emulator" @@ -38,7 +36,9 @@ import ( "github.com/awslabs/kro/internal/graph/schema" "github.com/awslabs/kro/internal/graph/variable" "github.com/awslabs/kro/internal/metadata" - "github.com/awslabs/kro/internal/simpleschema" + krocel "github.com/awslabs/kro/pkg/cel" + "github.com/awslabs/kro/pkg/cel/ast" + "github.com/awslabs/kro/pkg/simpleschema" ) // NewBuilder creates a new GraphBuilder instance. diff --git a/internal/graph/schema/conversion_cel.go b/internal/graph/schema/conversion_cel.go index 1ad9f6ed..c49c7508 100644 --- a/internal/graph/schema/conversion_cel.go +++ b/internal/graph/schema/conversion_cel.go @@ -19,7 +19,7 @@ import ( "github.com/google/cel-go/common/types/ref" extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - krocel "github.com/awslabs/kro/internal/cel" + krocel "github.com/awslabs/kro/pkg/cel" ) // inferSchemaFromCELValue infers a JSONSchemaProps from a CEL value. diff --git a/internal/runtime/runtime.go b/internal/runtime/runtime.go index 5f511a37..d69fcb63 100644 --- a/internal/runtime/runtime.go +++ b/internal/runtime/runtime.go @@ -22,9 +22,9 @@ import ( "golang.org/x/exp/maps" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - krocel "github.com/awslabs/kro/internal/cel" "github.com/awslabs/kro/internal/graph/variable" "github.com/awslabs/kro/internal/runtime/resolver" + krocel "github.com/awslabs/kro/pkg/cel" ) // Compile time proof to ensure that ResourceGroupRuntime implements the diff --git a/internal/runtime/runtime_test.go b/internal/runtime/runtime_test.go index 1176d3cf..ce873d07 100644 --- a/internal/runtime/runtime_test.go +++ b/internal/runtime/runtime_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - krocel "github.com/awslabs/kro/internal/cel" "github.com/awslabs/kro/internal/graph/variable" + krocel "github.com/awslabs/kro/pkg/cel" ) func Test_RuntimeWorkflow(t *testing.T) { diff --git a/internal/cel/ast/inspector.go b/pkg/cel/ast/inspector.go similarity index 99% rename from internal/cel/ast/inspector.go rename to pkg/cel/ast/inspector.go index fab117dc..9c6ef23b 100644 --- a/internal/cel/ast/inspector.go +++ b/pkg/cel/ast/inspector.go @@ -20,7 +20,7 @@ import ( "github.com/google/cel-go/cel" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" - krocel "github.com/awslabs/kro/internal/cel" + krocel "github.com/awslabs/kro/pkg/cel" ) // ResourceDependency represents a resource and its accessed path within a CEL expression. diff --git a/internal/cel/ast/inspector_test.go b/pkg/cel/ast/inspector_test.go similarity index 100% rename from internal/cel/ast/inspector_test.go rename to pkg/cel/ast/inspector_test.go diff --git a/internal/cel/conversions.go b/pkg/cel/conversions.go similarity index 100% rename from internal/cel/conversions.go rename to pkg/cel/conversions.go diff --git a/internal/cel/environment.go b/pkg/cel/environment.go similarity index 100% rename from internal/cel/environment.go rename to pkg/cel/environment.go diff --git a/internal/client/crd.go b/pkg/client/crd.go similarity index 100% rename from internal/client/crd.go rename to pkg/client/crd.go diff --git a/internal/client/set.go b/pkg/client/set.go similarity index 100% rename from internal/client/set.go rename to pkg/client/set.go diff --git a/internal/dynamiccontroller/dynamic_controller.go b/pkg/dynamiccontroller/dynamic_controller.go similarity index 99% rename from internal/dynamiccontroller/dynamic_controller.go rename to pkg/dynamiccontroller/dynamic_controller.go index e9d498a0..467eaccd 100644 --- a/internal/dynamiccontroller/dynamic_controller.go +++ b/pkg/dynamiccontroller/dynamic_controller.go @@ -76,7 +76,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "github.com/awslabs/kro/internal/metadata" - "github.com/awslabs/kro/internal/requeue" + "github.com/awslabs/kro/pkg/requeue" ) // Config holds the configuration for DynamicController diff --git a/internal/dynamiccontroller/dynamic_controller_test.go b/pkg/dynamiccontroller/dynamic_controller_test.go similarity index 100% rename from internal/dynamiccontroller/dynamic_controller_test.go rename to pkg/dynamiccontroller/dynamic_controller_test.go diff --git a/internal/dynamiccontroller/metrics.go b/pkg/dynamiccontroller/metrics.go similarity index 100% rename from internal/dynamiccontroller/metrics.go rename to pkg/dynamiccontroller/metrics.go diff --git a/internal/requeue/requeue.go b/pkg/requeue/requeue.go similarity index 100% rename from internal/requeue/requeue.go rename to pkg/requeue/requeue.go diff --git a/internal/simpleschema/atomic.go b/pkg/simpleschema/atomic.go similarity index 100% rename from internal/simpleschema/atomic.go rename to pkg/simpleschema/atomic.go diff --git a/internal/simpleschema/atomic_test.go b/pkg/simpleschema/atomic_test.go similarity index 100% rename from internal/simpleschema/atomic_test.go rename to pkg/simpleschema/atomic_test.go diff --git a/internal/simpleschema/doc.go b/pkg/simpleschema/doc.go similarity index 100% rename from internal/simpleschema/doc.go rename to pkg/simpleschema/doc.go diff --git a/internal/simpleschema/field.go b/pkg/simpleschema/field.go similarity index 100% rename from internal/simpleschema/field.go rename to pkg/simpleschema/field.go diff --git a/internal/simpleschema/field_test.go b/pkg/simpleschema/field_test.go similarity index 100% rename from internal/simpleschema/field_test.go rename to pkg/simpleschema/field_test.go diff --git a/internal/simpleschema/markers.go b/pkg/simpleschema/markers.go similarity index 100% rename from internal/simpleschema/markers.go rename to pkg/simpleschema/markers.go diff --git a/internal/simpleschema/markers_test.go b/pkg/simpleschema/markers_test.go similarity index 100% rename from internal/simpleschema/markers_test.go rename to pkg/simpleschema/markers_test.go diff --git a/internal/simpleschema/simplerschema.go b/pkg/simpleschema/simplerschema.go similarity index 100% rename from internal/simpleschema/simplerschema.go rename to pkg/simpleschema/simplerschema.go diff --git a/internal/simpleschema/transform.go b/pkg/simpleschema/transform.go similarity index 100% rename from internal/simpleschema/transform.go rename to pkg/simpleschema/transform.go diff --git a/internal/simpleschema/transform_test.go b/pkg/simpleschema/transform_test.go similarity index 100% rename from internal/simpleschema/transform_test.go rename to pkg/simpleschema/transform_test.go diff --git a/test/integration/environment/setup.go b/test/integration/environment/setup.go index 82b4f362..ef874638 100644 --- a/test/integration/environment/setup.go +++ b/test/integration/environment/setup.go @@ -29,11 +29,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/server" krov1alpha1 "github.com/awslabs/kro/api/v1alpha1" - kroclient "github.com/awslabs/kro/internal/client" ctrlinstance "github.com/awslabs/kro/internal/controller/instance" ctrlresourcegroup "github.com/awslabs/kro/internal/controller/resourcegroup" - "github.com/awslabs/kro/internal/dynamiccontroller" "github.com/awslabs/kro/internal/graph" + kroclient "github.com/awslabs/kro/pkg/client" + "github.com/awslabs/kro/pkg/dynamiccontroller" ) type Environment struct {