File tree Expand file tree Collapse file tree 9 files changed +10
-37
lines changed Expand file tree Collapse file tree 9 files changed +10
-37
lines changed Original file line number Diff line number Diff line change 3
3
4
4
package featureflag
5
5
6
- var Auth = enabled ("AUTH" )
6
+ var Auth = enable ("AUTH" )
Original file line number Diff line number Diff line change @@ -18,15 +18,15 @@ type feature struct {
18
18
19
19
var features = map [string ]* feature {}
20
20
21
- func disabled (name string ) * feature {
21
+ func disable (name string ) * feature {
22
22
if features [name ] == nil {
23
23
features [name ] = & feature {name : name }
24
24
}
25
25
features [name ].enabled = false
26
26
return features [name ]
27
27
}
28
28
29
- func enabled (name string ) * feature {
29
+ func enable (name string ) * feature {
30
30
if features [name ] == nil {
31
31
features [name ] = & feature {name : name }
32
32
}
@@ -54,10 +54,6 @@ func (f *feature) Enabled() bool {
54
54
return f .enabled
55
55
}
56
56
57
- func (f * feature ) Disabled () bool {
58
- return ! f .Enabled ()
59
- }
60
-
61
57
// All returns a map of all known features flags and whether they're enabled.
62
58
func All () map [string ]bool {
63
59
m := make (map [string ]bool , len (features ))
Original file line number Diff line number Diff line change @@ -11,23 +11,23 @@ import (
11
11
12
12
func TestEnabledFeature (t * testing.T ) {
13
13
name := "TestEnabledFeature"
14
- enabled (name )
14
+ enable (name )
15
15
if ! features [name ].Enabled () {
16
16
t .Errorf ("got %s.Enabled() = false, want true." , name )
17
17
}
18
18
}
19
19
20
20
func TestDisabledFeature (t * testing.T ) {
21
21
name := "TestDisabledFeature"
22
- disabled (name )
22
+ disable (name )
23
23
if features [name ].Enabled () {
24
24
t .Errorf ("got %s.Enabled() = true, want false." , name )
25
25
}
26
26
}
27
27
28
28
func TestEnabledFeatureEnv (t * testing.T ) {
29
29
name := "TestEnabledFeatureEnv"
30
- disabled (name )
30
+ disable (name )
31
31
t .Setenv (envir .DevboxFeaturePrefix + name , "1" )
32
32
if ! features [name ].Enabled () {
33
33
t .Errorf ("got %s.Enabled() = false, want true." , name )
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -2,4 +2,4 @@ package featureflag
2
2
3
3
// PromptHook controls the insertion of a shell prompt hook that invokes
4
4
// devbox shellenv, in lieu of using binary wrappers.
5
- var PromptHook = disabled ("PROMPT_HOOK" )
5
+ var PromptHook = disable ("PROMPT_HOOK" )
Original file line number Diff line number Diff line change @@ -4,4 +4,4 @@ package featureflag
4
4
// It leverages the search index to directly map <package>@<version> to
5
5
// the /nix/store/<hash>-<package>-<version> that can be fetched from
6
6
// cache.nixpkgs.org.
7
- var RemoveNixpkgs = disabled ("REMOVE_NIXPKGS" )
7
+ var RemoveNixpkgs = disable ("REMOVE_NIXPKGS" )
Original file line number Diff line number Diff line change @@ -5,4 +5,4 @@ package featureflag
5
5
6
6
// ScriptExitOnError controls whether scripts defined in devbox.json
7
7
// and executed via `devbox run` should exit if any command within them errors.
8
- var ScriptExitOnError = disabled ("SCRIPT_EXIT_ON_ERROR" )
8
+ var ScriptExitOnError = disable ("SCRIPT_EXIT_ON_ERROR" )
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ import (
12
12
13
13
"github.com/samber/lo"
14
14
"go.jetpack.io/devbox/internal/boxcli/featureflag"
15
+
15
16
"go.jetpack.io/devbox/internal/cuecfg"
16
17
"go.jetpack.io/devbox/internal/devpkg"
17
18
)
@@ -145,11 +146,6 @@ func (l *File) ResolveToCurrentNixpkgCommitHash(pkg string) error {
145
146
}
146
147
147
148
func (l * File ) Save () error {
148
- // Never write lockfile if versioned packages is not enabled
149
- if ! featureflag .LockFile .Enabled () {
150
- return nil
151
- }
152
-
153
149
return cuecfg .WriteFile (lockFilePath (l .devboxProject ), l )
154
150
}
155
151
@@ -185,8 +181,5 @@ func lockFilePath(project devboxProject) string {
185
181
}
186
182
187
183
func getLockfileHash (project devboxProject ) (string , error ) {
188
- if ! featureflag .LockFile .Enabled () {
189
- return "" , nil
190
- }
191
184
return cuecfg .FileHash (lockFilePath (project ))
192
185
}
You can’t perform that action at this time.
0 commit comments