Merge pull request #35 from ctrlplanedev/update-metadata-match-relationship

chore: update metadata match relationship

Author: adityachoudhari26

cmd/ctrlc/root/api/create/create.go

@@ -2,11 +2,9 @@ package create
 
 import (
 	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/create/deploymentversion"
-	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/create/deploymentversionchannel"
 	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/create/environment"
 	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/create/relationship"
 	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/create/release"
-	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/create/releasechannel"
 	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/create/system"
 	"github.com/spf13/cobra"
 )
@@ -21,8 +19,6 @@ func NewCreateCmd() *cobra.Command {
 		},
 	}
 
-	cmd.AddCommand(releasechannel.NewCreateReleaseChannelCmd())
-	cmd.AddCommand(deploymentversionchannel.NewCreateDeploymentVersionChannelCmd())
 	cmd.AddCommand(deploymentversion.NewCreateDeploymentVersionCmd())
 	cmd.AddCommand(environment.NewCreateEnvironmentCmd())
 	cmd.AddCommand(relationship.NewRelationshipCmd())

cmd/ctrlc/root/api/create/deploymentversionchannel/deployment-version-channel.go

@@ -13,8 +13,6 @@ import (
 
 func NewCreateEnvironmentCmd() *cobra.Command {
 	var nameFlag string
-	var releaseChannels []string
-	var deploymentVersionChannels []string
 	var system string
 	var resourceSelector string
 	var metadata map[string]string
@@ -42,8 +40,6 @@ func NewCreateEnvironmentCmd() *cobra.Command {
 
 			body := api.CreateEnvironmentJSONRequestBody{}
 			body.Name = nameFlag
-			body.ReleaseChannels = &releaseChannels
-			body.DeploymentVersionChannels = &deploymentVersionChannels
 			body.SystemId = system
 			body.Metadata = cliutil.StringMapPtr(metadata)
 
@@ -66,8 +62,6 @@ func NewCreateEnvironmentCmd() *cobra.Command {
 
 	cmd.Flags().StringVarP(&nameFlag, "name", "n", "", "Name of the environment (required)")
 	cmd.Flags().StringVarP(&system, "system", "s", "", "ID of the system (required)")
-	cmd.Flags().StringSliceVarP(&releaseChannels, "release-channel", "r", []string{}, "Release channel in format <channelid>")
-	cmd.Flags().StringSliceVarP(&deploymentVersionChannels, "deployment-version-channel", "d", []string{}, "Deployment version channel in format <channelid>")
 	cmd.Flags().StringVarP(&resourceSelector, "resource-selector", "f", "", "Resource selector as JSON string")
 	cmd.Flags().StringToStringVarP(&metadata, "metadata", "m", make(map[string]string), "Metadata key-value pairs (e.g. --metadata key=value)")
 

cmd/ctrlc/root/api/create/environment/environment.go

@@ -1,10 +1,8 @@
 package delete
 
 import (
-	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/delete/deploymentversionchannel"
 	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/delete/environment"
 	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/delete/policy"
-	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/delete/releasechannel"
 	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/delete/resource"
 	"github.com/spf13/cobra"
 )
@@ -21,8 +19,6 @@ func NewDeleteCmd() *cobra.Command {
 
 	cmd.AddCommand(resource.NewDeleteResourceCmd())
 	cmd.AddCommand(environment.NewDeleteEnvironmentCmd())
-	cmd.AddCommand(releasechannel.NewDeleteReleaseChannelCmd())
-	cmd.AddCommand(deploymentversionchannel.NewDeleteDeploymentVersionChannelCmd())
 	cmd.AddCommand(policy.NewDeletePolicyCmd())
 	return cmd
 }

cmd/ctrlc/root/api/create/releasechannel/release-channel.go

@@ -40,12 +40,42 @@ func processResourceRelationships(
 	}
 }
 
+func createMetadataKeysMatch(match MetadataKeysMatch) (*struct {
+	SourceKey string `json:"sourceKey"`
+	TargetKey string `json:"targetKey"`
+}, error) {
+	if match.Key != nil {
+		return &struct {
+			SourceKey string `json:"sourceKey"`
+			TargetKey string `json:"targetKey"`
+		}{
+			SourceKey: *match.Key,
+			TargetKey: *match.Key,
+		}, nil
+	}
+
+	if match.SourceKey == nil || match.TargetKey == nil {
+		return nil, fmt.Errorf("sourceKey and targetKey must be provided")
+	}
+
+	return &struct {
+		SourceKey string `json:"sourceKey"`
+		TargetKey string `json:"targetKey"`
+	}{
+		SourceKey: *match.SourceKey,
+		TargetKey: *match.TargetKey,
+	}, nil
+}
+
 func createRelationshipRequestBody(workspaceId string, relationship ResourceRelationship) api.CreateResourceRelationshipRule {
 	config := api.CreateResourceRelationshipRule{
-		WorkspaceId:         workspaceId,
-		Reference:           relationship.Reference,
-		DependencyType:      api.ResourceRelationshipRuleDependencyType(relationship.DependencyType),
-		MetadataKeysMatches: &[]string{},
+		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"`
@@ -82,7 +112,22 @@ func createRelationshipRequestBody(workspaceId string, relationship ResourceRela
 	}
 
 	if relationship.MetadataKeysMatch != nil {
-		config.MetadataKeysMatches = &relationship.MetadataKeysMatch
+		metadataKeysMatches := []struct {
+			SourceKey string `json:"sourceKey"`
+			TargetKey string `json:"targetKey"`
+		}{}
+
+		for _, match := range relationship.MetadataKeysMatch {
+			metadataKeysMatch, err := createMetadataKeysMatch(match)
+			if err != nil {
+				log.Error("Failed to create metadata keys match", "error", err, "match", match)
+				continue
+			}
+
+			metadataKeysMatches = append(metadataKeysMatches, *metadataKeysMatch)
+		}
+
+		config.MetadataKeysMatches = &metadataKeysMatches
 	}
 
 	// Log the MetadataTargetKeysEquals for debugging