Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #1668: cancel previous context before issuing a new one #1679

Merged
merged 3 commits into from
Sep 3, 2020
Merged

fix #1668: cancel previous context before issuing a new one #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ff0d91
fix #1668: cancel previous context before issuing a new one
nicolaferraro Aug 31, 2020
bab1307
Fix #1668: restore catalog
nicolaferraro Sep 2, 2020
9d99ef0
Fix #1668: fix out and err channels in command
nicolaferraro Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 16 additions & 2 deletions pkg/cmd/modeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ var (
nonRunOptions = map[string]bool{
"language": true, // language is a marker modeline option for other tools
}
disallowedOptions = map[string]bool{
"dev": true,
"wait": true,
"logs": true,
"sync": true,
}

// file options must be considered relative to the source files they belong to
fileOptions = map[string]bool{
Expand Down Expand Up @@ -116,6 +122,10 @@ func createKamelWithModelineCommand(ctx context.Context, args []string, processe
return nil, nil, errors.Wrapf(err, "cannot process file %s", f)
}
for i, o := range ops {
if disallowedOptions[o.Name] {
return nil, nil, fmt.Errorf("option %q is disallowed in modeline", o.Name)
}

if fileOptions[o.Name] && isLocal(f) {
refPath := o.Value
if !filepath.IsAbs(refPath) {
Expand Down Expand Up @@ -157,8 +167,12 @@ func createKamelWithModelineCommand(ctx context.Context, args []string, processe
if len(o.Name) > 1 {
prefix = "--"
}
args = append(args, fmt.Sprintf("%s%s", prefix, o.Name))
args = append(args, o.Value)
// Using the k=v syntax to avoid issues with booleans
if len(o.Value) > 0 {
args = append(args, fmt.Sprintf("%s%s=%s", prefix, o.Name, o.Value))
} else {
args = append(args, fmt.Sprintf("%s%s", prefix, o.Name))
}
}

return createKamelWithModelineCommand(ctx, args, processedFiles)
Expand Down
8 changes: 4 additions & 4 deletions pkg/cmd/modeline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestModelineRunSimple(t *testing.T) {
cmd, flags, err := NewKamelWithModelineCommand(context.TODO(), []string{"kamel", "run", fileName})
assert.NoError(t, err)
assert.NotNil(t, cmd)
assert.Equal(t, []string{"run", fileName, "--dependency", "mvn:org.my/lib:1.0"}, flags)
assert.Equal(t, []string{"run", fileName, "--dependency=mvn:org.my/lib:1.0"}, flags)
}

func TestModelineRunHelp(t *testing.T) {
Expand Down Expand Up @@ -73,7 +73,7 @@ func TestModelineRunChain(t *testing.T) {
cmd, flags, err := NewKamelWithModelineCommand(context.TODO(), []string{"kamel", "run", "-d", "mvn:org.my/lib2:1.0", fileName})
assert.NoError(t, err)
assert.NotNil(t, cmd)
assert.Equal(t, []string{"run", "-d", "mvn:org.my/lib2:1.0", fileName, "--dependency", "mvn:org.my/lib:2.0"}, flags)
assert.Equal(t, []string{"run", "-d", "mvn:org.my/lib2:1.0", fileName, "--dependency=mvn:org.my/lib:2.0"}, flags)
}

func TestModelineRunMultipleFiles(t *testing.T) {
Expand All @@ -98,7 +98,7 @@ func TestModelineRunMultipleFiles(t *testing.T) {
cmd, flags, err := NewKamelWithModelineCommand(context.TODO(), []string{"kamel", "run", fileName})
assert.NoError(t, err)
assert.NotNil(t, cmd)
assert.Equal(t, []string{"run", fileName, "--source", fileName2, "--dependency", "mvn:org.my/lib:3.0"}, flags)
assert.Equal(t, []string{"run", fileName, "--source=" + fileName2, "--dependency=mvn:org.my/lib:3.0"}, flags)
}

func TestModelineRunPropertyFiles(t *testing.T) {
Expand Down Expand Up @@ -127,5 +127,5 @@ func TestModelineRunPropertyFiles(t *testing.T) {
cmd, flags, err := NewKamelWithModelineCommand(context.TODO(), []string{"kamel", "run", fileName})
assert.NoError(t, err)
assert.NotNil(t, cmd)
assert.Equal(t, []string{"run", fileName, "--property-file", propFileName}, flags)
assert.Equal(t, []string{"run", fileName, "--property-file=" + propFileName}, flags)
}
15 changes: 10 additions & 5 deletions pkg/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,21 @@ superpowers.

// RootCmdOptions --
type RootCmdOptions struct {
Context context.Context `mapstructure:"-"`
_client client.Client `mapstructure:"-"`
KubeConfig string `mapstructure:"kube-config"`
Namespace string `mapstructure:"namespace"`
RootContext context.Context `mapstructure:"-"`
Context context.Context `mapstructure:"-"`
ContextCancel context.CancelFunc `mapstructure:"-"`
_client client.Client `mapstructure:"-"`
KubeConfig string `mapstructure:"kube-config"`
Namespace string `mapstructure:"namespace"`
}

// NewKamelCommand --
func NewKamelCommand(ctx context.Context) (*cobra.Command, error) {
childCtx, childCancel := context.WithCancel(ctx)
options := RootCmdOptions{
Context: ctx,
RootContext: ctx,
Context: childCtx,
ContextCancel: childCancel,
}

var err error
Expand Down
20 changes: 15 additions & 5 deletions pkg/cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,10 @@ func (o *runCmdOptions) run(cmd *cobra.Command, args []string) error {
signal.Notify(cs, os.Interrupt, syscall.SIGTERM)
go func() {
<-cs
if o.Context.Err() != nil {
// Context canceled
return
}
fmt.Printf("Run integration terminating\n")
err := DeleteIntegration(o.Context, c, integration.Name, integration.Namespace)
if err != nil {
Expand All @@ -291,7 +295,7 @@ func (o *runCmdOptions) run(cmd *cobra.Command, args []string) error {
}

if o.Sync || o.Dev {
err = o.syncIntegration(c, args, catalog)
err = o.syncIntegration(cmd, c, args, catalog)
if err != nil {
return err
}
Expand Down Expand Up @@ -338,9 +342,9 @@ func (o *runCmdOptions) run(cmd *cobra.Command, args []string) error {
}
}

if o.Sync && !o.Logs && !o.Dev {
if o.Sync || o.Logs || o.Dev {
// Let's add a Wait point, otherwise the script terminates
<-o.Context.Done()
<-o.RootContext.Done()
}

return nil
Expand Down Expand Up @@ -387,7 +391,7 @@ func (o *runCmdOptions) waitForIntegrationReady(cmd *cobra.Command, integration
return watch.HandleIntegrationStateChanges(o.Context, integration, handler)
}

func (o *runCmdOptions) syncIntegration(c client.Client, sources []string, catalog *trait.Catalog) error {
func (o *runCmdOptions) syncIntegration(cmd *cobra.Command, c client.Client, sources []string, catalog *trait.Catalog) error {
// Let's watch all relevant files when in dev mode
var files []string
files = append(files, sources...)
Expand All @@ -408,7 +412,9 @@ func (o *runCmdOptions) syncIntegration(c client.Client, sources []string, catal
return
case <-changes:
// let's create a new command to parse modeline changes and update our integration
newCmd, _, err := createKamelWithModelineCommand(o.Context, os.Args[1:], make(map[string]bool))
newCmd, _, err := createKamelWithModelineCommand(o.RootContext, os.Args[1:], make(map[string]bool))
newCmd.SetOut(cmd.OutOrStdout())
newCmd.SetErr(cmd.ErrOrStderr())
if err != nil {
fmt.Println("Unable to sync integration: ", err.Error())
continue
Expand All @@ -420,6 +426,10 @@ func (o *runCmdOptions) syncIntegration(c client.Client, sources []string, catal
return err
}
newCmd.PostRunE = nil

// cancel the existing command to release watchers
o.ContextCancel()
// run the new one
err = newCmd.Execute()
if err != nil {
fmt.Println("Unable to sync integration: ", err.Error())
Expand Down