Skip to content

Commit de7bd23

Browse files
fix: Update cli with selector refactor
1 parent b5d1206 commit de7bd23

File tree

4 files changed

+51
-51
lines changed

4 files changed

+51
-51
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func NewCreateEnvironmentCmd() *cobra.Command {
1515
var nameFlag string
1616
var releaseChannels []string
1717
var system string
18-
var resourceFilter string
18+
var resourceSelector string
1919
var metadata map[string]string
2020
cmd := &cobra.Command{
2121
Use: "environment [flags]",
@@ -42,12 +42,12 @@ func NewCreateEnvironmentCmd() *cobra.Command {
4242
body.SystemId = system
4343
body.Metadata = cliutil.StringMapPtr(metadata)
4444

45-
if resourceFilter != "" {
46-
var parsedFilter map[string]interface{}
47-
if err := json.Unmarshal([]byte(resourceFilter), &parsedFilter); err != nil {
48-
return fmt.Errorf("failed to parse target filter: %w", err)
45+
if resourceSelector != "" {
46+
var parsedSelector map[string]interface{}
47+
if err := json.Unmarshal([]byte(resourceSelector), &parsedSelector); err != nil {
48+
return fmt.Errorf("failed to parse target selector: %w", err)
4949
}
50-
body.ResourceFilter = &parsedFilter
50+
body.ResourceSelector = &parsedSelector
5151
}
5252

5353
resp, err := client.CreateEnvironment(cmd.Context(), body)
@@ -62,7 +62,7 @@ func NewCreateEnvironmentCmd() *cobra.Command {
6262
cmd.Flags().StringVarP(&nameFlag, "name", "n", "", "Name of the environment (required)")
6363
cmd.Flags().StringVarP(&system, "system", "s", "", "ID of the system (required)")
6464
cmd.Flags().StringSliceVarP(&releaseChannels, "release-channel", "r", []string{}, "Release channel in format <channelid>")
65-
cmd.Flags().StringVarP(&resourceFilter, "resource-filter", "f", "", "Resource filter as JSON string")
65+
cmd.Flags().StringVarP(&resourceSelector, "resource-selector", "f", "", "Resource selector as JSON string")
6666
cmd.Flags().StringToStringVarP(&metadata, "metadata", "m", make(map[string]string), "Metadata key-value pairs (e.g. --metadata key=value)")
6767

6868
cmd.MarkFlagRequired("name")

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func NewCreateReleaseChannelCmd() *cobra.Command {
1515
var name string
1616
var deploymentID string
1717
var description string
18-
var filter string
18+
var selector string
1919

2020
cmd := &cobra.Command{
2121
Use: "release-channel [flags]",
@@ -36,18 +36,18 @@ func NewCreateReleaseChannelCmd() *cobra.Command {
3636
return fmt.Errorf("failed to create API client: %w", err)
3737
}
3838

39-
releaseFilter := make(map[string]interface{})
40-
if filter != "" {
41-
if err := json.Unmarshal([]byte(filter), &releaseFilter); err != nil {
42-
return fmt.Errorf("failed to parse release filter JSON: %w", err)
39+
releaseSelector := make(map[string]interface{})
40+
if selector != "" {
41+
if err := json.Unmarshal([]byte(selector), &releaseSelector); err != nil {
42+
return fmt.Errorf("failed to parse release selector JSON: %w", err)
4343
}
4444
}
4545

4646
resp, err := client.CreateReleaseChannel(cmd.Context(), api.CreateReleaseChannelJSONRequestBody{
47-
Name: name,
48-
DeploymentId: deploymentID,
49-
Description: &description,
50-
ReleaseFilter: releaseFilter,
47+
Name: name,
48+
DeploymentId: deploymentID,
49+
Description: &description,
50+
ReleaseSelector: releaseSelector,
5151
})
5252
if err != nil {
5353
return fmt.Errorf("failed to create release channel: %w", err)
@@ -60,7 +60,7 @@ func NewCreateReleaseChannelCmd() *cobra.Command {
6060
// Add flags
6161
cmd.Flags().StringVar(&name, "name", "", "Name of the release channel (required)")
6262
cmd.Flags().StringVar(&deploymentID, "deployment", "", "ID of the deployment (required)")
63-
cmd.Flags().StringVar(&filter, "filter", "", "JSON string containing release filter criteria")
63+
cmd.Flags().StringVar(&selector, "selector", "", "JSON string containing release selector criteria")
6464
cmd.Flags().StringVar(&description, "description", "", "Description of the release channel")
6565
cmd.MarkFlagRequired("name")
6666
cmd.MarkFlagRequired("deployment-id")

cmd/ctrlc/root/run/exec/runner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (r *ExecRunner) Status(job api.Job) (api.JobStatus, string) {
3939
// to check if process exists
4040
err = process.Signal(syscall.Signal(0))
4141
if err != nil {
42-
return api.JobStatusSuccessful, fmt.Sprintf("process not running: %v", err)
42+
return api.JobStatusFailure, fmt.Sprintf("process not running: %v", err)
4343
}
4444

4545
return api.JobStatusInProgress, fmt.Sprintf("process running with pid %d", externalId)

internal/api/client.gen.go

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)