remove vendorized argo models and use the argo package directly

charts/argobot/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: argobot
 description: Helm chart for the corymurphy/argobot app
 type: application
-version: 0.9.0
-appVersion: 0.9.0
+version: 0.10.0
+appVersion: 0.10.0

pkg/argocd/applications_client.go

@@ -12,7 +12,7 @@ import (
 	"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
 	"github.com/argoproj/argo-cd/v2/pkg/apiclient/settings"
 	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	models "github.com/corymurphy/argobot/pkg/argocd/models"
+	// argp
 	// models "github.com/corymurphy/argobot/pkg/argocd/models"
 )
 
@@ -63,32 +63,32 @@ func (c *ApplicationsClient) Apply(app string, revision string) (string, error)
 	return string(body), nil
 }
 
-func (c *ApplicationsClient) List() (models.V1alpha1ApplicationList, error) {
-	var apps models.V1alpha1ApplicationList
+func (c *ApplicationsClient) List() (*argoappv1.ApplicationList, error) {
+	var apps argoappv1.ApplicationList
 	url := fmt.Sprintf("%s/api/v1/applications", c.BaseUrl)
 	req, err := http.NewRequest("GET", url, nil)
 
 	if err != nil {
-		return apps, err
+		return &apps, err
 	}
 	req.Header.Add("Content-Type", "application/json")
 	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", c.Token))
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return apps, err
+		return &apps, err
 	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return apps, err
+		return &apps, err
 	}
 
 	if err := json.Unmarshal(body, &apps); err != nil {
-		return apps, err
+		return &apps, err
 	}
 
-	return apps, nil
+	return &apps, nil
 }
 
 func (c *ApplicationsClient) Get(name string) (*argoappv1.Application, error) {

pkg/argocd/diff.go

@@ -19,7 +19,6 @@ import (
 	"github.com/argoproj/gitops-engine/pkg/sync/hook"
 	"github.com/argoproj/gitops-engine/pkg/sync/ignore"
 	"github.com/argoproj/gitops-engine/pkg/utils/kube"
-	models "github.com/corymurphy/argobot/pkg/argocd/models"
 	"github.com/corymurphy/argobot/pkg/logging"
 	"gopkg.in/yaml.v2"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -40,7 +39,7 @@ func Plan(ctx context.Context, argoSettings *settings.Settings, app *argoappv1.A
 	var unstructureds []*unstructured.Unstructured
 
 	for _, mfst := range target.Manifests {
-		obj, err := models.UnmarshalToUnstructured(mfst)
+		obj, err := UnmarshalToUnstructured(mfst)
 		if err != nil {
 			return plan, hasDiff, nil
 		}

pkg/argocd/models/extensions.go → pkg/argocd/extensions.go

@@ -1,15 +1,11 @@
-package models
+package argocd
 
 import (
 	"encoding/json"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
-func (r V1alpha1ResourceDiff) LiveObject() (*unstructured.Unstructured, error) {
-	return UnmarshalToUnstructured(r.LiveState)
-}
-
 func UnmarshalToUnstructured(resource string) (*unstructured.Unstructured, error) {
 	if resource == "" || resource == "null" {
 		return nil, nil