Merge pull request #165 from MisterMX/refactor/remove-apis-argocd-imp…

…orts

refactor(apis): Remove argocd imports

apis/applications/v1alpha1/status.go

@@ -1,7 +1,6 @@
 package v1alpha1
 
 import (
-	"github.com/argoproj/gitops-engine/pkg/health"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -84,7 +83,7 @@ type SyncStatus struct {
 // HealthStatus contains information about the currently observed health state of an application or resource
 type HealthStatus struct {
 	// Status holds the status code of the application or resource
-	Status health.HealthStatusCode `json:"status,omitempty" protobuf:"bytes,1,opt,name=status"`
+	Status string `json:"status,omitempty" protobuf:"bytes,1,opt,name=status"`
 	// Message is a human-readable informational message describing the health status
 	Message *string `json:"message,omitempty" protobuf:"bytes,2,opt,name=message"`
 }

apis/generate.go

@@ -28,14 +28,9 @@ limitations under the License.
 // Generate crossplane-runtime methodsets (resource.Managed, etc)
 //go:generate go run -tags generate github.com/crossplane/crossplane-tools/cmd/angryjet generate-methodsets --header-file=../hack/boilerplate.go.txt ./...
 
-// Generate conversion code
-//go:generate go run -tags generate github.com/jmattheis/goverter/cmd/goverter gen -output-constraint !ignore_autogenerated ./...
-
 package apis
 
 import (
-	_ "github.com/jmattheis/goverter/cmd/goverter" //nolint:typecheck
-
 	_ "sigs.k8s.io/controller-tools/cmd/controller-gen" //nolint:typecheck
 
 	_ "github.com/crossplane/crossplane-tools/cmd/angryjet" //nolint:typecheck

apis/applications/v1alpha1/conversions.go → pkg/clients/applications/conversions.go

@@ -1,9 +1,11 @@
-package v1alpha1
+package applications
 
 import (
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/crossplane-contrib/provider-argocd/apis/applications/v1alpha1"
 )
 
 // Converter helps to convert ArgoCD types to api types of this provider and vise-versa
@@ -14,21 +16,21 @@ import (
 // goverter:extend ExtV1JSONToRuntimeRawExtension
 // goverter:struct:comment // +k8s:deepcopy-gen=false
 // goverter:output:file ./zz_generated.conversion.go
-// goverter:output:package github.com/crossplane-contrib/provider-argocd/apis/applications/v1alpha1
+// goverter:output:package github.com/crossplane-contrib/provider-argocd/pkg/clients/applications
 // +k8s:deepcopy-gen=false
 type Converter interface {
 
 	// goverter:ignore ServerRef
 	// goverter:ignore ServerSelector
 	// goverter:ignore NameRef
 	// goverter:ignore NameSelector
-	FromArgoDestination(in argocdv1alpha1.ApplicationDestination) ApplicationDestination
+	FromArgoDestination(in argocdv1alpha1.ApplicationDestination) v1alpha1.ApplicationDestination
 
-	ToArgoDestination(in ApplicationDestination) argocdv1alpha1.ApplicationDestination
+	ToArgoDestination(in v1alpha1.ApplicationDestination) argocdv1alpha1.ApplicationDestination
 
-	ToArgoApplicationSpec(in *ApplicationParameters) *argocdv1alpha1.ApplicationSpec
+	ToArgoApplicationSpec(in *v1alpha1.ApplicationParameters) *argocdv1alpha1.ApplicationSpec
 
-	FromArgoApplicationStatus(in *argocdv1alpha1.ApplicationStatus) *ArgoApplicationStatus
+	FromArgoApplicationStatus(in *argocdv1alpha1.ApplicationStatus) *v1alpha1.ArgoApplicationStatus
 }
 
 // ExtV1JSONToRuntimeRawExtension converts an extv1.JSON into a

apis/applicationsets/v1alpha1/conversions.go → pkg/clients/applicationsets/conversions.go

@@ -1,9 +1,11 @@
-package v1alpha1
+package applicationsets
 
 import (
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/crossplane-contrib/provider-argocd/apis/applicationsets/v1alpha1"
 )
 
 // Converter helps to convert ArgoCD types to api types of this provider and vise-versa
@@ -14,23 +16,23 @@ import (
 // goverter:extend ExtV1JSONToRuntimeRawExtension
 // goverter:struct:comment // +k8s:deepcopy-gen=false
 // goverter:output:file ./zz_generated.conversion.go
-// goverter:output:package github.com/crossplane-contrib/provider-argocd/apis/applicationsets/v1alpha1
+// goverter:output:package github.com/crossplane-contrib/provider-argocd/pkg/clients/applicationsets
 // +k8s:deepcopy-gen=false
 type Converter interface {
 
 	// goverter:ignore ServerRef
 	// goverter:ignore ServerSelector
 	// goverter:ignore NameRef
 	// goverter:ignore NameSelector
-	FromArgoDestination(in argocdv1alpha1.ApplicationDestination) ApplicationDestination
+	FromArgoDestination(in argocdv1alpha1.ApplicationDestination) v1alpha1.ApplicationDestination
 
-	ToArgoDestination(in ApplicationDestination) argocdv1alpha1.ApplicationDestination
+	ToArgoDestination(in v1alpha1.ApplicationDestination) argocdv1alpha1.ApplicationDestination
 
-	ToArgoApplicationSetSpec(in *ApplicationSetParameters) *argocdv1alpha1.ApplicationSetSpec
-	FromArgoApplicationSetSpec(in *argocdv1alpha1.ApplicationSetSpec) *ApplicationSetParameters
+	ToArgoApplicationSetSpec(in *v1alpha1.ApplicationSetParameters) *argocdv1alpha1.ApplicationSetSpec
+	FromArgoApplicationSetSpec(in *argocdv1alpha1.ApplicationSetSpec) *v1alpha1.ApplicationSetParameters
 
-	FromArgoApplicationSetStatus(in *argocdv1alpha1.ApplicationSetStatus) *ArgoApplicationSetStatus
-	ToArgoApplicationSetStatus(in *ArgoApplicationSetStatus) *argocdv1alpha1.ApplicationSetStatus
+	FromArgoApplicationSetStatus(in *argocdv1alpha1.ApplicationSetStatus) *v1alpha1.ArgoApplicationSetStatus
+	ToArgoApplicationSetStatus(in *v1alpha1.ArgoApplicationSetStatus) *argocdv1alpha1.ApplicationSetStatus
 }
 
 // ExtV1JSONToRuntimeRawExtension converts an extv1.JSON into a