Just moving stuff around

commercetools · Apr 19, 2024 · 94e309f · 94e309f
1 parent aef665c
commit 94e309f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/internal/pkg/argocd/argocd.go b/internal/pkg/argocd/argocd.go
@@ -23,6 +23,15 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
+// DiffElement struct to store diff element details, this represents a single k8s object
+type DiffElement struct {
+	ObjectGroup     string
+	ObjectName      string
+	ObjectKind      string
+	ObjectNamespace string
+	Diff            string
+}
+
 // DiffResult struct to store diff result
 type DiffResult struct {
 	ComponentPath string
@@ -144,15 +153,6 @@ func diffLiveVsTargetObject(live, target *unstructured.Unstructured) (string, er
 	return patch, nil
 }
 
-// DiffElement struct to store diff element details, this represents a single k8s object
-type DiffElement struct {
-	ObjectGroup     string
-	ObjectName      string
-	ObjectKind      string
-	ObjectNamespace string
-	Diff            string
-}
-
 func getEnv(key, fallback string) string {
 	if value, ok := os.LookupEnv(key); ok {
 		return value

diff --git a/internal/pkg/argocd/argocd_copied_from_upsteam.go b/internal/pkg/argocd/argocd_copied_from_upsteam.go
@@ -33,18 +33,18 @@ type resourceInfoProvider struct {
 	namespacedByGk map[schema.GroupKind]bool
 }
 
-// Infer if obj is namespaced or not from corresponding live objects list. If corresponding live object has namespace then target object is also namespaced.
-// If live object is missing then it does not matter if target is namespaced or not.
-func (p *resourceInfoProvider) IsNamespaced(gk schema.GroupKind) (bool, error) {
-	return p.namespacedByGk[gk], nil
-}
-
 type objKeyLiveTarget struct {
 	key    kube.ResourceKey
 	live   *unstructured.Unstructured
 	target *unstructured.Unstructured
 }
 
+// Infer if obj is namespaced or not from corresponding live objects list. If corresponding live object has namespace then target object is also namespaced.
+// If live object is missing then it does not matter if target is namespaced or not.
+func (p *resourceInfoProvider) IsNamespaced(gk schema.GroupKind) (bool, error) {
+	return p.namespacedByGk[gk], nil
+}
+
 // copied from https://github.com/argoproj/argo-cd/blob/4f6a8dce80f0accef7ed3b5510e178a6b398b331/cmd/argocd/commands/app.go#L1091-L1109
 func groupObjsByKey(localObs []*unstructured.Unstructured, liveObjs []*unstructured.Unstructured, appNamespace string) map[kube.ResourceKey]*unstructured.Unstructured {
 	namespacedByGk := make(map[schema.GroupKind]bool)