clean up relationships api

Author: jsbroks

cmd/ctrlc/root/apply/relationships.go

@@ -72,33 +72,21 @@ func createRelationshipRequestBody(workspaceId string, relationship ResourceRela
 		WorkspaceId:    workspaceId,
 		Reference:      relationship.Reference,
 		DependencyType: api.ResourceRelationshipRuleDependencyType(relationship.DependencyType),
-		MetadataKeysMatches: &[]struct {
-			SourceKey string `json:"sourceKey"`
-			TargetKey string `json:"targetKey"`
-		}{},
-		TargetMetadataEquals: &[]struct {
-			Key   string `json:"key"`
-			Value string `json:"value"`
-		}{},
+		MetadataKeysMatches: &[]api.MetadataKeyMatchConstraint{},
+		TargetMetadataEquals: &[]api.MetadataEqualsConstraint{},
 	}
 
 	if relationship.Target != nil {
 		config.TargetKind = relationship.Target.Kind
 		config.TargetVersion = relationship.Target.Version
 
 		if relationship.Target.MetadataEquals != nil {
-			targetMetadataEquals := []struct {
-				Key   string `json:"key"`
-				Value string `json:"value"`
-			}{}
+			targetMetadataEquals := []api.MetadataEqualsConstraint{}
 
 			for key, value := range relationship.Target.MetadataEquals {
-				targetMetadataEquals = append(targetMetadataEquals, struct {
-					Key   string `json:"key"`
-					Value string `json:"value"`
-				}{
-					Key:   key,
-					Value: value,
+				targetMetadataEquals = append(targetMetadataEquals, api.MetadataEqualsConstraint{
+					Key:   &key,
+					Value: &value,
 				})
 			}
 
@@ -112,10 +100,7 @@ func createRelationshipRequestBody(workspaceId string, relationship ResourceRela
 	}
 
 	if relationship.MetadataKeysMatch != nil {
-		metadataKeysMatches := []struct {
-			SourceKey string `json:"sourceKey"`
-			TargetKey string `json:"targetKey"`
-		}{}
+		metadataKeysMatches := []api.MetadataKeyMatchConstraint{}
 
 		for _, match := range relationship.MetadataKeysMatch {
 			metadataKeysMatch, err := createMetadataKeysMatch(match)
@@ -134,7 +119,7 @@ func createRelationshipRequestBody(workspaceId string, relationship ResourceRela
 	if config.TargetMetadataEquals != nil && len(*config.TargetMetadataEquals) > 0 {
 		fmt.Println("MetadataTargetEquals:")
 		for _, kv := range *config.TargetMetadataEquals {
-			fmt.Printf("  Key: %s, Value: %s\n", kv.Key, kv.Value)
+			fmt.Printf("  Key: %s, Value: %s\n", *kv.Key, *kv.Value)
 		}
 	}
 

cmd/ctrlc/root/sync/aws/eks/eks.go

@@ -293,10 +293,7 @@ var relationshipRules = []api.CreateResourceRelationshipRule{
 		TargetVersion: "ctrlplane.dev/network/v1",
 		TargetKind:    "AmazonNetwork",
 
-		MetadataKeysMatches: &[]struct {
-			SourceKey string `json:"sourceKey"`
-			TargetKey string `json:"targetKey"`
-		}{
+		MetadataKeysMatches: &[]api.MetadataKeyMatchConstraint{
 			{SourceKey: "aws/region", TargetKey: "aws/region"},
 			{SourceKey: "network/name", TargetKey: "network/name"},
 		},

cmd/ctrlc/root/sync/aws/rds/rds.go

@@ -468,10 +468,7 @@ var relationshipRules = []api.CreateResourceRelationshipRule{
 		TargetVersion: "ctrlplane.dev/network/v1",
 		TargetKind:    "AmazonNetwork",
 
-		MetadataKeysMatches: &[]struct {
-			SourceKey string `json:"sourceKey"`
-			TargetKey string `json:"targetKey"`
-		}{
+		MetadataKeysMatches: &[]api.MetadataKeyMatchConstraint{
 			{SourceKey: "aws/region", TargetKey: "aws/region"},
 			{SourceKey: "network/name", TargetKey: "network/name"},
 		},

cmd/ctrlc/root/sync/azure/aks/aks.go

@@ -421,10 +421,7 @@ var relationshipRules = []api.CreateResourceRelationshipRule{
 		TargetVersion: "ctrlplane.dev/network/v1",
 		TargetKind:    "AzureNetwork",
 
-		MetadataKeysMatches: &[]struct {
-			SourceKey string `json:"sourceKey"`
-			TargetKey string `json:"targetKey"`
-		}{
+		MetadataKeysMatches: &[]api.MetadataKeyMatchConstraint{
 			{SourceKey: "azure/subscription", TargetKey: "azure/subscription"},
 			{SourceKey: "azure/resource-group", TargetKey: "azure/resource-group"},
 		},

cmd/ctrlc/root/sync/google/cloudsql/cloudsql.go

@@ -382,10 +382,7 @@ var relationshipRules = []api.CreateResourceRelationshipRule{
 		TargetVersion: "ctrlplane.dev/network/v1",
 		TargetKind:    "GoogleNetwork",
 
-		MetadataKeysMatches: &[]struct {
-			SourceKey string `json:"sourceKey"`
-			TargetKey string `json:"targetKey"`
-		}{
+		MetadataKeysMatches: &[]api.MetadataKeyMatchConstraint{
 			{SourceKey: "google/project", TargetKey: "google/project"},
 			{SourceKey: "network/id", TargetKey: "network/id"},
 		},

cmd/ctrlc/root/sync/google/gke/gke.go

@@ -389,10 +389,7 @@ var relationshipRules = []api.CreateResourceRelationshipRule{
 		TargetVersion: "ctrlplane.dev/network/v1",
 		TargetKind:    "GoogleNetwork",
 
-		MetadataKeysMatches: &[]struct {
-			SourceKey string `json:"sourceKey"`
-			TargetKey string `json:"targetKey"`
-		}{
+		MetadataKeysMatches: &[]api.MetadataKeyMatchConstraint{
 			{SourceKey: "google/project", TargetKey: "google/project"},
 			{SourceKey: "network/id", TargetKey: "network/id"},
 		},

cmd/ctrlc/root/sync/kubernetes/vcluster.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"maps"
 	"strconv"
 	"time"
 
@@ -95,11 +96,8 @@ func generateVclusterMetadata(vcluster find.VCluster, clusterMetadata api.Metada
 		}
 	}
 
-	if clusterMetadata != nil {
-		for key, value := range clusterMetadata {
-			metadata[key] = value
-		}
-	}
+
+	maps.Copy(metadata, clusterMetadata)
 
 	return metadata, nil
 }
@@ -163,10 +161,7 @@ func createResourceRelationshipRule(ctx context.Context, resourceProvider *api.R
 		return fmt.Errorf("unsupported cluster kind: %s", clusterResource.Kind)
 	}
 
-	metadataKeysMatches := []struct {
-		SourceKey string `json:"sourceKey"`
-		TargetKey string `json:"targetKey"`
-	}{
+	metadataKeysMatches := []api.MetadataKeyMatchConstraint{
 		{SourceKey: metadataKey, TargetKey: metadataKey},
 	}