Merge pull request #191 from sailpoint-oss/fix/customizersEndpoint

tyler-mairose-sp · web-flow · commit 357ad0b68dae · 2025-05-06T11:18:07.000-04:00
Revert change to customizers endpoint
diff --git a/cmd/connector/customizer_create.go b/cmd/connector/customizer_create.go
@@ -26,8 +26,7 @@ func newCustomizerCreateCmd(client client.Client) *cobra.Command {
 				return err
 			}
 
-			endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()
-			resp, err := client.Post(cmd.Context(), util.ResourceUrl(endpoint, "customizers"), "application/json", bytes.NewReader(raw), nil)
+			resp, err := client.Post(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint), "application/json", bytes.NewReader(raw), nil)
 			if err != nil {
 				return err
 			}
diff --git a/cmd/connector/customizer_create_version.go b/cmd/connector/customizer_create_version.go
@@ -45,8 +45,7 @@ func newCustomizerCreateVersionCmd(client client.Client) *cobra.Command {
 				return err
 			}
 
-			endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()
-			resp, err := client.Post(cmd.Context(), util.ResourceUrl(endpoint, id, "versions"), "application/zip", f, nil)
+			resp, err := client.Post(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint, id, "versions"), "application/zip", f, nil)
 			if err != nil {
 				return err
 			}
diff --git a/cmd/connector/customizer_delete.go b/cmd/connector/customizer_delete.go
@@ -20,8 +20,7 @@ func newCustomizerDeleteCmd(client client.Client) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			id := cmd.Flags().Lookup("id").Value.String()
 
-			endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()
-			resp, err := client.Delete(cmd.Context(), util.ResourceUrl(endpoint, id), nil, nil)
+			resp, err := client.Delete(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint, id), nil, nil)
 			if err != nil {
 				return err
 			}
diff --git a/cmd/connector/customizer_get.go b/cmd/connector/customizer_get.go
@@ -21,9 +21,8 @@ func newCustomizerGetCmd(client client.Client) *cobra.Command {
 		Args:    cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			id := cmd.Flags().Lookup("id").Value.String()
-			endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()
 
-			resp, err := client.Get(cmd.Context(), util.ResourceUrl(endpoint, id), nil)
+			resp, err := client.Get(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint, id), nil)
 			if err != nil {
 				return err
 			}
diff --git a/cmd/connector/customizer_link.go b/cmd/connector/customizer_link.go
@@ -33,8 +33,7 @@ func newCustomizerLinkCmd(client client.Client) *cobra.Command {
 				return err
 			}
 
-			endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()
-			resp, err := client.Patch(cmd.Context(), util.ResourceUrl(endpoint, instanceID, "link"), bytes.NewReader(raw), nil)
+			resp, err := client.Patch(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint, instanceID, "link"), bytes.NewReader(raw), nil)
 			if err != nil {
 				return err
 			}
@@ -68,8 +67,5 @@ func newCustomizerLinkCmd(client client.Client) *cobra.Command {
 	cmd.Flags().StringP("instance-id", "i", "", "Connector instance ID")
 	_ = cmd.MarkFlagRequired("instance-id")
 
-	cmd.Flags().StringP("conn-endpoint", "e", "", "Connector endpoint")
-	_ = cmd.MarkFlagRequired("conn-endpoint")
-
 	return cmd
 }
diff --git a/cmd/connector/customizer_list.go b/cmd/connector/customizer_list.go
@@ -20,8 +20,7 @@ func newCustomizerListCmd(client client.Client) *cobra.Command {
 		Example: "sail conn customizers list",
 		Args:    cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()
-			resp, err := client.Get(cmd.Context(), util.ResourceUrl(endpoint, "customizers"), nil)
+			resp, err := client.Get(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint), nil)
 			if err != nil {
 				return err
 			}
diff --git a/cmd/connector/customizer_unlink.go b/cmd/connector/customizer_unlink.go
@@ -22,7 +22,6 @@ func newCustomizerUnlinkCmd(client client.Client) *cobra.Command {
 		Args:    cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			instanceID := cmd.Flags().Lookup("instance-id").Value.String()
-			endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()
 
 			raw, err := json.Marshal([]interface{}{map[string]interface{}{
 				"op":   "remove",
@@ -32,7 +31,7 @@ func newCustomizerUnlinkCmd(client client.Client) *cobra.Command {
 				return err
 			}
 
-			resp, err := client.Patch(cmd.Context(), util.ResourceUrl(endpoint, instanceID, "unlink"), bytes.NewReader(raw), nil)
+			resp, err := client.Patch(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint, instanceID, "unlink"), bytes.NewReader(raw), nil)
 			if err != nil {
 				return err
 			}
@@ -62,8 +61,6 @@ func newCustomizerUnlinkCmd(client client.Client) *cobra.Command {
 
 	cmd.Flags().StringP("instance-id", "i", "", "Connector instance ID")
 	_ = cmd.MarkFlagRequired("instance-id")
-	cmd.Flags().StringP("conn-endpoint", "e", "", "Connector endpoint")
-	_ = cmd.MarkFlagRequired("conn-endpoint")
 
 	return cmd
 }
diff --git a/cmd/connector/customizer_update.go b/cmd/connector/customizer_update.go
@@ -30,8 +30,7 @@ func newCustomizerUpdateCmd(client client.Client) *cobra.Command {
 				return err
 			}
 
-			endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()
-			resp, err := client.Put(cmd.Context(), util.ResourceUrl(endpoint, id), "application/json", bytes.NewReader(raw), nil)
+			resp, err := client.Put(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint, id), "application/json", bytes.NewReader(raw), nil)
 			if err != nil {
 				return err
 			}
@@ -65,8 +64,5 @@ func newCustomizerUpdateCmd(client client.Client) *cobra.Command {
 	cmd.Flags().StringP("name", "n", "", "name of the connector customizer")
 	_ = cmd.MarkFlagRequired("name")
 
-	cmd.Flags().StringP("conn-endpoint", "e", "", "Connector endpoint")
-	_ = cmd.MarkFlagRequired("conn-endpoint")
-
 	return cmd
 }
diff --git a/cmd/connector/instance_list.go b/cmd/connector/instance_list.go
@@ -20,8 +20,7 @@ func newInstanceListCmd(client client.Client) *cobra.Command {
 		Example: "sail conn instances list",
 		Args:    cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()
-			resp, err := client.Get(cmd.Context(), util.ResourceUrl(endpoint, "instances"), nil)
+			resp, err := client.Get(cmd.Context(), util.ResourceUrl(connectorInstancesEndpoint), nil)
 			if err != nil {
 				return err
 			}

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ func newCustomizerCreateCmd(client client.Client) *cobra.Command {`
`26`	`26`	`return err`
`27`	`27`	`}`
`28`	`28`
`29`		`- endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()`
`30`		`- resp, err := client.Post(cmd.Context(), util.ResourceUrl(endpoint, "customizers"), "application/json", bytes.NewReader(raw), nil)`
	`29`	`+ resp, err := client.Post(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint), "application/json", bytes.NewReader(raw), nil)`
`31`	`30`	`if err != nil {`
`32`	`31`	`return err`
`33`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ func newCustomizerCreateVersionCmd(client client.Client) *cobra.Command {`
`45`	`45`	`return err`
`46`	`46`	`}`
`47`	`47`
`48`		`- endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()`
`49`		`- resp, err := client.Post(cmd.Context(), util.ResourceUrl(endpoint, id, "versions"), "application/zip", f, nil)`
	`48`	`+ resp, err := client.Post(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint, id, "versions"), "application/zip", f, nil)`
`50`	`49`	`if err != nil {`
`51`	`50`	`return err`
`52`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,7 @@ func newCustomizerDeleteCmd(client client.Client) *cobra.Command {`
`20`	`20`	`RunE: func(cmd *cobra.Command, args []string) error {`
`21`	`21`	`id := cmd.Flags().Lookup("id").Value.String()`
`22`	`22`
`23`		`- endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()`
`24`		`- resp, err := client.Delete(cmd.Context(), util.ResourceUrl(endpoint, id), nil, nil)`
	`23`	`+ resp, err := client.Delete(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint, id), nil, nil)`
`25`	`24`	`if err != nil {`
`26`	`25`	`return err`
`27`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@ func newCustomizerLinkCmd(client client.Client) *cobra.Command {`
`33`	`33`	`return err`
`34`	`34`	`}`
`35`	`35`
`36`		`- endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()`
`37`		`- resp, err := client.Patch(cmd.Context(), util.ResourceUrl(endpoint, instanceID, "link"), bytes.NewReader(raw), nil)`
	`36`	`+ resp, err := client.Patch(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint, instanceID, "link"), bytes.NewReader(raw), nil)`
`38`	`37`	`if err != nil {`
`39`	`38`	`return err`
`40`	`39`	`}`
`@@ -68,8 +67,5 @@ func newCustomizerLinkCmd(client client.Client) *cobra.Command {`
`68`	`67`	`cmd.Flags().StringP("instance-id", "i", "", "Connector instance ID")`
`69`	`68`	`_ = cmd.MarkFlagRequired("instance-id")`
`70`	`69`
`71`		`- cmd.Flags().StringP("conn-endpoint", "e", "", "Connector endpoint")`
`72`		`- _ = cmd.MarkFlagRequired("conn-endpoint")`
`73`		`-`
`74`	`70`	`return cmd`
`75`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ func newCustomizerUpdateCmd(client client.Client) *cobra.Command {`
`30`	`30`	`return err`
`31`	`31`	`}`
`32`	`32`
`33`		`- endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()`
`34`		`- resp, err := client.Put(cmd.Context(), util.ResourceUrl(endpoint, id), "application/json", bytes.NewReader(raw), nil)`
	`33`	`+ resp, err := client.Put(cmd.Context(), util.ResourceUrl(connectorCustomizersEndpoint, id), "application/json", bytes.NewReader(raw), nil)`
`35`	`34`	`if err != nil {`
`36`	`35`	`return err`
`37`	`36`	`}`
`@@ -65,8 +64,5 @@ func newCustomizerUpdateCmd(client client.Client) *cobra.Command {`
`65`	`64`	`cmd.Flags().StringP("name", "n", "", "name of the connector customizer")`
`66`	`65`	`_ = cmd.MarkFlagRequired("name")`
`67`	`66`
`68`		`- cmd.Flags().StringP("conn-endpoint", "e", "", "Connector endpoint")`
`69`		`- _ = cmd.MarkFlagRequired("conn-endpoint")`
`70`		`-`
`71`	`67`	`return cmd`
`72`	`68`	`}`