introduce --watch #11525
introduce --watch #11525
Conversation
ndeloof
force-pushed
the
up_watch
branch
2 times, most recently
from
85c9274
to
10ad564
Compare
ndeloof
requested review from
a team,
glours,
milas and
jhrotko
and removed request for
a team
|
Could you add an e2e test for this new use case? |
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #11525 +/- ##
==========================================
+ Coverage 58.29% 58.33% +0.04%
==========================================
Files 135 135
Lines 11555 11576 +21
==========================================
+ Hits 6736 6753 +17
+ Misses 4155 4154 -1
- Partials 664 669 +5 ☔ View full report in Codecov by Sentry. |
|
@jhrotko watch e2e tests are disabled "until we can figure out why they are flaky/failing" 🥲 |
|
as long as we don't know the root cause, I don't see any reason this would be better with up. I plan to revisit the watch test suite as a follow-up PR |
| func TestWatch_Sync(t *testing.T) { | ||
| mockCtrl := gomock.NewController(t) | ||
| cli := mocks.NewMockCli(mockCtrl) | ||
| cli.EXPECT().Err().Return(os.Stderr).AnyTimes() | ||
| cli.EXPECT().BuildKitEnabled().Return(true, nil) | ||
| apiClient := mocks.NewMockAPIClient(mockCtrl) | ||
| apiClient.EXPECT().ContainerList(gomock.Any(), gomock.Any()).Return([]moby.Container{ |
There was a problem hiding this comment.
I think it's also missing apiClient.EXPECT().ContainerStart(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
There was a problem hiding this comment.
nope, this test doesn't implement a full build+restart cycle, it actually mimic a "build failed" scenario
using mocks here isn't nice, I plan to re-implement this as a plain e2e test, just need to find a way to make things visible so assertions are not a pain to define
What I did
This introduces a new
--watchflag todocker compose upso watch feature can be enabled on up, with all the logs attachement features.Watch events are reported mixed with application logs, but use of a reserved log stream name allows to offer a distinguished rendering
demo: https://asciinema.org/a/S3I2cyLUa0xomePNACgvo75Cg
Long term, I expect this also to allow dynamically enabling watch mode on a running
upcommand.Related issue
fixes #11089
(not mandatory) A picture of a cute animal, if possible in relation to what you did