Skip to content

Commit fd532a3

Browse files
authored
fix(desktop): remove overly-aggressive feature flag check (#11748)
1 parent 2aa568c commit fd532a3

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

internal/experimental/experimental.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ func (s *State) NavBar() bool {
7171
return s.determineFeatureState("ComposeNav")
7272
}
7373

74-
func (s *State) AutoFileShares() bool {
75-
return s.determineFeatureState("ComposeAutoFileShares")
76-
}
77-
7874
func (s *State) determineFeatureState(name string) bool {
7975
if s == nil || !s.active || s.desktopValues == nil {
8076
return false

pkg/compose/desktop.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ func (s *composeService) SetExperiments(experiments *experimental.State) {
3333
}
3434

3535
func (s *composeService) manageDesktopFileSharesEnabled(ctx context.Context) bool {
36-
// there's some slightly redundancy here to avoid fetching the config if
37-
// we can already tell the feature state - in practice, we
38-
if !s.isDesktopIntegrationActive() || !s.experiments.AutoFileShares() {
36+
if !s.isDesktopIntegrationActive() {
3937
return false
4038
}
4139

40+
// synchronized file share support in Docker Desktop is dependent upon
41+
// a variety of factors (settings, OS, etc), which this endpoint abstracts
4242
fileSharesConfig, err := s.desktopCli.GetFileSharesConfig(ctx)
4343
if err != nil {
4444
logrus.Debugf("Failed to retrieve file shares config: %v", err)

0 commit comments

Comments
 (0)