Merge pull request #159 from michaelhtm/export/pkg

Export certain packages from `internal` to `pkg`
kro-run · Dec 3, 2024 · bfcd4bf · bfcd4bf
2 parents 45cac11 + cd35c39
commit bfcd4bf
Show file tree

Hide file tree

Showing 31 changed files with 18 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -29,16 +29,16 @@ 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"
 	"github.com/awslabs/kro/internal/graph/parser"
 	"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
@@ -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
@@ -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
@@ -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 → pkg/cel/ast/inspector.go b/internal/cel/ast/inspector.go → 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 → pkg/cel/ast/inspector_test.go b/internal/cel/ast/inspector_test.go → pkg/cel/ast/inspector_test.go
diff --git a/internal/cel/conversions.go → pkg/cel/conversions.go b/internal/cel/conversions.go → pkg/cel/conversions.go
diff --git a/internal/cel/environment.go → pkg/cel/environment.go b/internal/cel/environment.go → pkg/cel/environment.go
diff --git a/internal/client/crd.go → pkg/client/crd.go b/internal/client/crd.go → pkg/client/crd.go
diff --git a/internal/client/set.go → pkg/client/set.go b/internal/client/set.go → pkg/client/set.go
diff --git a/...l/dynamiccontroller/dynamic_controller.go → pkg/dynamiccontroller/dynamic_controller.go b/...l/dynamiccontroller/dynamic_controller.go → 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/...amiccontroller/dynamic_controller_test.go → ...amiccontroller/dynamic_controller_test.go b/...amiccontroller/dynamic_controller_test.go → ...amiccontroller/dynamic_controller_test.go
diff --git a/internal/dynamiccontroller/metrics.go → pkg/dynamiccontroller/metrics.go b/internal/dynamiccontroller/metrics.go → pkg/dynamiccontroller/metrics.go
diff --git a/internal/requeue/requeue.go → pkg/requeue/requeue.go b/internal/requeue/requeue.go → pkg/requeue/requeue.go
diff --git a/internal/simpleschema/atomic.go → pkg/simpleschema/atomic.go b/internal/simpleschema/atomic.go → pkg/simpleschema/atomic.go
diff --git a/internal/simpleschema/atomic_test.go → pkg/simpleschema/atomic_test.go b/internal/simpleschema/atomic_test.go → pkg/simpleschema/atomic_test.go
diff --git a/internal/simpleschema/doc.go → pkg/simpleschema/doc.go b/internal/simpleschema/doc.go → pkg/simpleschema/doc.go
diff --git a/internal/simpleschema/field.go → pkg/simpleschema/field.go b/internal/simpleschema/field.go → pkg/simpleschema/field.go
diff --git a/internal/simpleschema/field_test.go → pkg/simpleschema/field_test.go b/internal/simpleschema/field_test.go → pkg/simpleschema/field_test.go
diff --git a/internal/simpleschema/markers.go → pkg/simpleschema/markers.go b/internal/simpleschema/markers.go → pkg/simpleschema/markers.go
diff --git a/internal/simpleschema/markers_test.go → pkg/simpleschema/markers_test.go b/internal/simpleschema/markers_test.go → pkg/simpleschema/markers_test.go
diff --git a/internal/simpleschema/simplerschema.go → pkg/simpleschema/simplerschema.go b/internal/simpleschema/simplerschema.go → pkg/simpleschema/simplerschema.go
diff --git a/internal/simpleschema/transform.go → pkg/simpleschema/transform.go b/internal/simpleschema/transform.go → pkg/simpleschema/transform.go
diff --git a/internal/simpleschema/transform_test.go → pkg/simpleschema/transform_test.go b/internal/simpleschema/transform_test.go → pkg/simpleschema/transform_test.go
diff --git 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 {