rename dir apis to api

undistro · May 8, 2023 · 5f289e7 · 5f289e7
1 parent 3111726
commit 5f289e7
Show file tree

Hide file tree

Showing 36 changed files with 33 additions and 31 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -22,7 +22,7 @@ COPY go.sum go.sum
 RUN go mod download
 
 COPY main.go main.go
-COPY apis/ apis/
+COPY api/ api/
 COPY controllers/ controllers/
 COPY pkg/ pkg/
 

diff --git a/apis/zora/v1alpha1/cluster_types.go → api/zora/v1alpha1/cluster_types.go b/apis/zora/v1alpha1/cluster_types.go → api/zora/v1alpha1/cluster_types.go
diff --git a/apis/zora/v1alpha1/clusterissue_types.go → api/zora/v1alpha1/clusterissue_types.go b/apis/zora/v1alpha1/clusterissue_types.go → api/zora/v1alpha1/clusterissue_types.go
diff --git a/apis/zora/v1alpha1/clusterscan_types.go → api/zora/v1alpha1/clusterscan_types.go b/apis/zora/v1alpha1/clusterscan_types.go → api/zora/v1alpha1/clusterscan_types.go
diff --git a/apis/zora/v1alpha1/clusterscan_types_test.go → api/zora/v1alpha1/clusterscan_types_test.go b/apis/zora/v1alpha1/clusterscan_types_test.go → api/zora/v1alpha1/clusterscan_types_test.go
diff --git a/apis/zora/v1alpha1/groupversion_info.go → api/zora/v1alpha1/groupversion_info.go b/apis/zora/v1alpha1/groupversion_info.go → api/zora/v1alpha1/groupversion_info.go
diff --git a/apis/zora/v1alpha1/plugin_types.go → api/zora/v1alpha1/plugin_types.go b/apis/zora/v1alpha1/plugin_types.go → api/zora/v1alpha1/plugin_types.go
diff --git a/apis/zora/v1alpha1/zz_generated.deepcopy.go → api/zora/v1alpha1/zz_generated.deepcopy.go b/apis/zora/v1alpha1/zz_generated.deepcopy.go → api/zora/v1alpha1/zz_generated.deepcopy.go
diff --git a/controllers/zora/cluster_controller.go b/controllers/zora/cluster_controller.go
@@ -20,7 +20,6 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/undistro/zora/pkg/saas"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -33,7 +32,9 @@ import (
 	ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
-	"github.com/undistro/zora/apis/zora/v1alpha1"
+	"github.com/undistro/zora/pkg/saas"
+
+	"github.com/undistro/zora/api/zora/v1alpha1"
 	"github.com/undistro/zora/pkg/discovery"
 	"github.com/undistro/zora/pkg/kubeconfig"
 )

diff --git a/controllers/zora/clusterscan_controller.go b/controllers/zora/clusterscan_controller.go
@@ -41,7 +41,7 @@ import (
 
 	"github.com/undistro/zora/pkg/saas"
 
-	"github.com/undistro/zora/apis/zora/v1alpha1"
+	"github.com/undistro/zora/api/zora/v1alpha1"
 	"github.com/undistro/zora/pkg/kubeconfig"
 	"github.com/undistro/zora/pkg/plugins/cronjobs"
 	"github.com/undistro/zora/pkg/plugins/errparse"

diff --git a/controllers/zora/suite_test.go b/controllers/zora/suite_test.go
@@ -28,7 +28,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	zorav1alpha1 "github.com/undistro/zora/apis/zora/v1alpha1"
+	zorav1alpha1 "github.com/undistro/zora/api/zora/v1alpha1"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/main.go b/main.go
@@ -34,7 +34,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	zorav1alpha1 "github.com/undistro/zora/apis/zora/v1alpha1"
+	zorav1alpha1 "github.com/undistro/zora/api/zora/v1alpha1"
 	zoracontrollers "github.com/undistro/zora/controllers/zora"
 	//+kubebuilder:scaffold:imports
 )

diff --git a/pkg/clientset/versioned/fake/register.go b/pkg/clientset/versioned/fake/register.go
diff --git a/pkg/clientset/versioned/scheme/register.go b/pkg/clientset/versioned/scheme/register.go
diff --git a/pkg/clientset/versioned/typed/zora/v1alpha1/cluster.go b/pkg/clientset/versioned/typed/zora/v1alpha1/cluster.go
diff --git a/pkg/clientset/versioned/typed/zora/v1alpha1/clusterissue.go b/pkg/clientset/versioned/typed/zora/v1alpha1/clusterissue.go
diff --git a/pkg/clientset/versioned/typed/zora/v1alpha1/clusterscan.go b/pkg/clientset/versioned/typed/zora/v1alpha1/clusterscan.go
diff --git a/pkg/clientset/versioned/typed/zora/v1alpha1/fake/fake_cluster.go b/pkg/clientset/versioned/typed/zora/v1alpha1/fake/fake_cluster.go
diff --git a/pkg/clientset/versioned/typed/zora/v1alpha1/fake/fake_clusterissue.go b/pkg/clientset/versioned/typed/zora/v1alpha1/fake/fake_clusterissue.go
diff --git a/pkg/clientset/versioned/typed/zora/v1alpha1/fake/fake_clusterscan.go b/pkg/clientset/versioned/typed/zora/v1alpha1/fake/fake_clusterscan.go
diff --git a/pkg/clientset/versioned/typed/zora/v1alpha1/zora_client.go b/pkg/clientset/versioned/typed/zora/v1alpha1/zora_client.go
diff --git a/pkg/payloads/v1alpha1/clusters.go b/pkg/payloads/v1alpha1/clusters.go
@@ -19,7 +19,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/undistro/zora/apis/zora/v1alpha1"
+	"github.com/undistro/zora/api/zora/v1alpha1"
 	"github.com/undistro/zora/pkg/formats"
 )
 

diff --git a/pkg/payloads/v1alpha1/clusters_test.go b/pkg/payloads/v1alpha1/clusters_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"sigs.k8s.io/yaml"
 
-	"github.com/undistro/zora/apis/zora/v1alpha1"
+	"github.com/undistro/zora/api/zora/v1alpha1"
 )
 
 func TestNewCluster(t *testing.T) {

diff --git a/pkg/payloads/v1alpha1/issues.go b/pkg/payloads/v1alpha1/issues.go
@@ -17,7 +17,7 @@ package v1alpha1
 import (
 	"strings"
 
-	"github.com/undistro/zora/apis/zora/v1alpha1"
+	"github.com/undistro/zora/api/zora/v1alpha1"
 )
 
 type Issue struct {

diff --git a/pkg/payloads/v1alpha1/issues_test.go b/pkg/payloads/v1alpha1/issues_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/undistro/zora/apis/zora/v1alpha1"
+	"github.com/undistro/zora/api/zora/v1alpha1"
 )
 
 func TestNewResourcedIssue(t *testing.T) {

diff --git a/pkg/plugins/cronjobs/cronjob.go b/pkg/plugins/cronjobs/cronjob.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/utils/pointer"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	"github.com/undistro/zora/apis/zora/v1alpha1"
+	"github.com/undistro/zora/api/zora/v1alpha1"
 	"github.com/undistro/zora/pkg/kubeconfig"
 )
 

diff --git a/pkg/saas/hooks.go b/pkg/saas/hooks.go
@@ -17,10 +17,11 @@ package saas
 import (
 	"context"
 
-	"github.com/undistro/zora/apis/zora/v1alpha1"
-	payloads "github.com/undistro/zora/pkg/payloads/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/undistro/zora/api/zora/v1alpha1"
+	payloads "github.com/undistro/zora/pkg/payloads/v1alpha1"
 )
 
 type ClusterHook func(ctx context.Context, cluster *v1alpha1.Cluster) error

diff --git a/pkg/worker/config/config.go b/pkg/worker/config/config.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/go-logr/logr"
 
-	zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
+	zorav1a1 "github.com/undistro/zora/api/zora/v1alpha1"
 	"github.com/undistro/zora/pkg/worker/report/marvin"
 	"github.com/undistro/zora/pkg/worker/report/popeye"
 )

diff --git a/pkg/worker/report/marvin/parse.go b/pkg/worker/report/marvin/parse.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/go-logr/logr"
 
-	"github.com/undistro/zora/apis/zora/v1alpha1"
+	"github.com/undistro/zora/api/zora/v1alpha1"
 )
 
 var marvinToZoraSeverity = map[string]v1alpha1.ClusterIssueSeverity{

diff --git a/pkg/worker/report/marvin/parse_test.go b/pkg/worker/report/marvin/parse_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/undistro/zora/apis/zora/v1alpha1"
+	"github.com/undistro/zora/api/zora/v1alpha1"
 )
 
 func TestParse(t *testing.T) {

diff --git a/pkg/worker/report/parse.go b/pkg/worker/report/parse.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/go-logr/logr"
 
-	zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
+	zorav1a1 "github.com/undistro/zora/api/zora/v1alpha1"
 	"github.com/undistro/zora/pkg/worker/config"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/worker/report/parse_test.go b/pkg/worker/report/parse_test.go
@@ -25,7 +25,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
+	zorav1a1 "github.com/undistro/zora/api/zora/v1alpha1"
 	"github.com/undistro/zora/pkg/worker/config"
 )
 

diff --git a/pkg/worker/report/popeye/parse.go b/pkg/worker/report/popeye/parse.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/go-logr/logr"
 
-	zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
+	zorav1a1 "github.com/undistro/zora/api/zora/v1alpha1"
 )
 
 var (

diff --git a/pkg/worker/report/popeye/parse_test.go b/pkg/worker/report/popeye/parse_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/google/go-cmp/cmp"
 
-	zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
+	zorav1a1 "github.com/undistro/zora/api/zora/v1alpha1"
 )
 
 func TestPrepareIdAndMsg(t *testing.T) {

diff --git a/pkg/worker/report/popeye/parse_types.go b/pkg/worker/report/popeye/parse_types.go
@@ -14,7 +14,7 @@
 
 package popeye
 
-import zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
+import zorav1a1 "github.com/undistro/zora/api/zora/v1alpha1"
 
 var (
 	// LevelToIssueSeverity maps Popeye's <Level> type to Zora's

diff --git a/pkg/worker/run/run.go b/pkg/worker/run/run.go
@@ -25,7 +25,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
+	zorav1a1 "github.com/undistro/zora/api/zora/v1alpha1"
 	"github.com/undistro/zora/pkg/clientset/versioned"
 	"github.com/undistro/zora/pkg/worker/config"
 	"github.com/undistro/zora/pkg/worker/report"
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ import ( @@
     	"github.com/go-logr/logr"
-    	zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1"
+    	zorav1a1 "github.com/undistro/zora/api/zora/v1alpha1"
     )
     var (
@@ Expand Down @@