Skip to content

Commit 7637342

Browse files
aledbfclaude
andcommitted
fix(features): write Feature ENV lines and options in declared order
The image's ENV lines for a Feature's containerEnv and the config's containerEnv, and the user's options in devcontainer-features.env, were written in sorted key order. The reference CLI writes them in JS property order (integer-index keys ascending, then declaration order). Besides the order itself, a Feature's ENV line that uses a variable an earlier line sets, such as PATH=${SDKMAN_DIR}/bin:${PATH} after SDKMAN_DIR, expanded to a different value when the sort put it first, so the built image's environment differed. The member order is now recorded where the documents are parsed (devcontainer-feature.json, devcontainer.json and its override, --additional-features) and carried to the generated Dockerfile through features.PropertyOrder. The two ts-oracle cases recorded as unresolved divergences now match TS, a TS-generated ts-features-build golden pins the dependent ENV lines, and a runtime parity case compares the built image's env and devcontainer-features.env with the reference. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent dad66a7 commit 7637342

33 files changed

Lines changed: 429 additions & 84 deletions

‎docs/parity/parity-matrix.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,6 +1079,20 @@ initial_cases:
10791079
current_status: match
10801080
notes: "Without BuildKit, TS builds the dev_container_feature_content_temp image from the features folder and COPYs /tmp/build-features/hello_0 to /tmp/dev-container-features/hello_0 (kept in the image), so verify_cmd also compares the staged devcontainer-features.env and the devcontainer-features-install.sh banner (getFeatureInstallWrapperScript). Go used to copy from the build context to /tmp/build-features/_dev_container_feature_0."
10811081

1082+
- id: build.features-env-declaration-order-success
1083+
lane: runtime
1084+
command: build
1085+
priority: p1
1086+
docker_required: true
1087+
setup_cmd: "WORKSPACE=/tmp/parity-${PARITY_CASE_ID}-${PARITY_SIDE}; rm -rf $WORKSPACE; mkdir -p $WORKSPACE/.devcontainer/sdk; printf '%s' '{\"id\":\"sdk\",\"version\":\"1.0.0\",\"name\":\"Sdk\",\"options\":{\"version\":{\"type\":\"string\",\"default\":\"latest\"}},\"containerEnv\":{\"SDKMAN_DIR\":\"/usr/local/sdkman\",\"PATH\":\"${SDKMAN_DIR}/bin:${PATH}\"}}' > $WORKSPACE/.devcontainer/sdk/devcontainer-feature.json; printf '%s\\n' '#!/bin/sh' 'set -e' 'cp devcontainer-features.env /features-env.txt' > $WORKSPACE/.devcontainer/sdk/install.sh; chmod +x $WORKSPACE/.devcontainer/sdk/install.sh; printf '%s' '{\"image\":\"alpine:3\",\"containerEnv\":{\"ZED\":\"1\",\"ALPHA\":\"2\"},\"features\":{\"./sdk\":{\"zz\":\"1\",\"version\":\"2\",\"aa\":\"3\"}}}' > $WORKSPACE/.devcontainer/devcontainer.json; echo WORKSPACE=$WORKSPACE"
1088+
ts_cmd: "build --workspace-folder ${WORKSPACE} --image-name parity-${PARITY_CASE_ID}-${PARITY_SIDE}"
1089+
verify_cmd: "docker run --rm ${IMAGE_NAME} cat /features-env.txt; echo; docker image inspect -f '{{json .Config.Env}}' ${IMAGE_NAME}"
1090+
cleanup_cmd: "docker rmi -f parity-${PARITY_CASE_ID}-${PARITY_SIDE} >/dev/null 2>&1; rm -rf /tmp/parity-${PARITY_CASE_ID}-${PARITY_SIDE}; true"
1091+
asserts: [exit_code, stdout_normalized]
1092+
class: build-runtime
1093+
current_status: match
1094+
notes: "TS writes a Feature's containerEnv as ENV lines in devcontainer-feature.json's order and the config's containerEnv in devcontainer.json's (generateContainerEnvs, Object.keys), and devcontainer-features.env lists the options the Feature declares, then the user's other options in the user's order (getFeatureValueObject). The Feature's PATH line uses SDKMAN_DIR, which the line before it sets, so the image's PATH starts with /usr/local/sdkman/bin. Go sorted the keys: PATH came first and expanded an unset SDKMAN_DIR to /bin, ALPHA preceded ZED, and AA preceded ZZ."
1095+
10821096
- id: up.compose-features-staging-layout-success
10831097
lane: runtime
10841098
command: up

‎internal/cli/build.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ func imageBuildFor(cfg *config.DevContainer, opts *buildOpts) imageBuild {
576576
}
577577

578578
func checkLegacyFeatures(feats map[string]any) error {
579-
userFeatures, _ := features.UpdateDeprecatedFeaturesIntoOptions(sortedUserFeatures(feats))
579+
userFeatures, _ := features.UpdateDeprecatedFeaturesIntoOptions(sortedUserFeatures(feats, nil))
580580
for _, f := range userFeatures {
581581
id, _ := features.BackwardCompatibleID(f.UserFeatureID)
582582
if features.ClassifyID(id) == features.SourceLegacyShorthand {
@@ -830,6 +830,8 @@ func (r *buildRunner) featureBuildOptions(cfg *config.DevContainer, hostSub *con
830830
Push: opts.push,
831831
Output: opts.output,
832832
ContainerEnv: cfg.ContainerEnv,
833+
ContainerEnvOrder: cfg.ContainerEnvOrder,
834+
FeatureOptionOrder: cfg.FeatureOptionOrder,
833835
FrozenLockfile: opts.experimentalFrozenLockfile,
834836
NoLockfile: opts.noLockfile,
835837
ConfigPath: cfg.ConfigFilePath,

‎internal/cli/compose_up.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ func (r *upRunner) composeFeatureSets(ctx context.Context, cfg *config.DevContai
274274
return nil, "", err
275275
}
276276
}
277-
res, err := fetchFeatureSetsWithOrder(ctx, r.log, cfg.Features, localFeatureRoots{filepath.Dir(cfg.ConfigFilePath), opts.workspaceFolder}, lockfile, cfg.OverrideFeatureInstallOrder)
277+
res, err := fetchFeatureSetsWithOrder(ctx, r.log, cfg.Features, cfg.FeatureOptionOrder, localFeatureRoots{filepath.Dir(cfg.ConfigFilePath), opts.workspaceFolder}, lockfile, cfg.OverrideFeatureInstallOrder)
278278
if err != nil {
279279
return nil, "", err
280280
}
@@ -454,6 +454,7 @@ func (r *upRunner) buildAndExtendCompose(ctx context.Context, s composeStart, pe
454454
UseBuildKitContexts: useContexts,
455455
Syntax: syntax,
456456
ConfigContainerEnv: cfg.ContainerEnv,
457+
ConfigEnvOrder: cfg.ContainerEnvOrder,
457458
})
458459
if !useContexts {
459460
if err := buildFeatureContentImage(ctx, r.docker, featuresFolder); err != nil {

‎internal/cli/feature_deps.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func newMetadataProcessFeature(client oci.Registry, logger log.Logger, local loc
4747
if err != nil {
4848
return nil, fmt.Errorf("ERR: Feature '%s' could not be processed. %w", id, err)
4949
}
50-
meta.Value = node.Options
50+
meta.Value, meta.ValueOrder = node.Options, node.OptionOrder
5151
if meta.ID == "" {
5252
meta.ID = id
5353
}
@@ -64,7 +64,7 @@ func newMetadataProcessFeature(client oci.Registry, logger log.Logger, local loc
6464
if err != nil {
6565
return nil, fmt.Errorf("ERR: Feature '%s' could not be processed. %w", id, err)
6666
}
67-
meta.Value = node.Options
67+
meta.Value, meta.ValueOrder = node.Options, node.OptionOrder
6868
return &features.Set{
6969
SourceInfo: &features.TarballSource{TarballURI: id, UserID: id},
7070
Features: []features.Feature{meta},
@@ -94,7 +94,7 @@ func newMetadataProcessFeature(client oci.Registry, logger log.Logger, local loc
9494
if annoID := ociAnnotationID(manifest); annoID != "" {
9595
meta.ID = annoID
9696
}
97-
meta.Value = node.Options
97+
meta.Value, meta.ValueOrder = node.Options, node.OptionOrder
9898

9999
return &features.Set{
100100
SourceInfo: &features.OCISource{

‎internal/cli/feature_install.go‎

Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ type FeatureBuildOptions struct {
4747
Secrets []string
4848
CABundle string
4949
ContainerEnv map[string]string
50+
ContainerEnvOrder []string
51+
FeatureOptionOrder map[string][]string
5052
SkipPersistCustoms bool
5153
FeaturesBasePath string
5254
WorkspaceFolder string
@@ -64,12 +66,12 @@ type fetchFeatureResult struct {
6466
TmpDir string
6567
}
6668

67-
func fetchFeatureSets(ctx context.Context, logger log.Logger, featuresCfg map[string]any, local localFeatureRoots) (*fetchFeatureResult, error) {
68-
return fetchFeatureSetsWithOrder(ctx, logger, featuresCfg, local, nil, nil)
69+
func fetchFeatureSets(ctx context.Context, logger log.Logger, featuresCfg map[string]any, optionOrder map[string][]string, local localFeatureRoots) (*fetchFeatureResult, error) {
70+
return fetchFeatureSetsWithOrder(ctx, logger, featuresCfg, optionOrder, local, nil, nil)
6971
}
7072

71-
func sortedUserFeatures(featuresCfg map[string]any) []features.DevContainerFeature {
72-
userFeatures := features.UserFeaturesToArray(featuresCfg)
73+
func sortedUserFeatures(featuresCfg map[string]any, optionOrder map[string][]string) []features.DevContainerFeature {
74+
userFeatures := features.UserFeaturesToArray(featuresCfg, optionOrder)
7375
sort.Slice(userFeatures, func(i, j int) bool {
7476
return userFeatures[i].UserFeatureID < userFeatures[j].UserFeatureID
7577
})
@@ -110,12 +112,12 @@ func createFeaturesFolder() (string, error) {
110112
}
111113
}
112114

113-
func fetchFeatureSetsWithOrder(ctx context.Context, logger log.Logger, featuresCfg map[string]any, local localFeatureRoots, lockfile *features.Lockfile, overrideOrder []string) (*fetchFeatureResult, error) {
115+
func fetchFeatureSetsWithOrder(ctx context.Context, logger log.Logger, featuresCfg map[string]any, optionOrder map[string][]string, local localFeatureRoots, lockfile *features.Lockfile, overrideOrder []string) (*fetchFeatureResult, error) {
114116
if len(featuresCfg) == 0 {
115117
return nil, nil
116118
}
117119

118-
userFeatures := sortedUserFeatures(featuresCfg)
120+
userFeatures := sortedUserFeatures(featuresCfg, optionOrder)
119121
userFeatures, warnings := features.UpdateDeprecatedFeaturesIntoOptions(userFeatures)
120122
for _, w := range warnings {
121123
logger.Write(w, log.LevelWarning)
@@ -169,21 +171,23 @@ func fetchFeatureSetsWithOrder(ctx context.Context, logger log.Logger, featuresC
169171

170172
const featureStagePrefix = ".stage-"
171173

172-
func featureFromMetadata(m features.Feature, id string, opts any, cachePath string) features.Feature {
174+
func featureFromMetadata(m features.Feature, id string, opts any, optOrder []string, cachePath string) features.Feature {
173175
return features.Feature{
174176
ID: id,
175177
Version: m.Version,
176178
Name: m.Name,
177179
Description: m.Description,
178180
DocumentationURL: m.DocumentationURL,
179181
Value: opts,
182+
ValueOrder: optOrder,
180183
UserOptions: extractUserOptions(opts),
181184
Options: m.Options,
182185
DependsOn: m.DependsOn,
183186
DependsOnOrder: m.DependsOnOrder,
184187
InstallsAfter: m.InstallsAfter,
185188
LegacyIds: m.LegacyIds,
186189
ContainerEnv: m.ContainerEnv,
190+
ContainerEnvOrder: m.ContainerEnvOrder,
187191
Mounts: m.Mounts,
188192
Init: m.Init,
189193
Privileged: m.Privileged,
@@ -212,7 +216,7 @@ func processInstallFeature(
212216
nextStageDir func() string,
213217
) (*features.Set, error) {
214218
id := node.UserFeatureID
215-
opts := node.Options
219+
opts, optOrder := node.Options, node.OptionOrder
216220
resolvedID, srcType, err := resolveFeatureID(logger, id)
217221
if err != nil {
218222
return nil, err
@@ -248,7 +252,7 @@ func processInstallFeature(
248252
if featID == "" {
249253
featID = filepath.Base(id)
250254
}
251-
feat := featureFromMetadata(m, featID, opts, featureDir)
255+
feat := featureFromMetadata(m, featID, opts, optOrder, featureDir)
252256
if feat.Name == "" {
253257
feat.Name = id
254258
}
@@ -287,7 +291,7 @@ func processInstallFeature(
287291
featID = tarballFeatureID(id)
288292
}
289293

290-
feat := featureFromMetadata(m, featID, opts, featureDir)
294+
feat := featureFromMetadata(m, featID, opts, optOrder, featureDir)
291295
if feat.Name == "" {
292296
feat.Name = id
293297
}
@@ -348,31 +352,33 @@ func processInstallFeature(
348352
}
349353

350354
feat := features.Feature{
351-
ID: cmp.Or(m.ID, ref.ID),
352-
Version: m.Version,
353-
Name: m.Name,
354-
Description: m.Description,
355-
DocumentationURL: m.DocumentationURL,
356-
Value: opts,
357-
UserOptions: extractUserOptions(opts),
358-
Options: m.Options,
359-
DependsOn: m.DependsOn,
360-
DependsOnOrder: m.DependsOnOrder,
361-
InstallsAfter: m.InstallsAfter,
362-
LegacyIds: m.LegacyIds,
363-
ContainerEnv: m.ContainerEnv,
364-
Init: m.Init,
365-
Privileged: m.Privileged,
366-
CapAdd: m.CapAdd,
367-
SecurityOpt: m.SecurityOpt,
368-
Entrypoint: m.Entrypoint,
369-
Mounts: m.Mounts,
370-
Customizations: m.Customizations,
371-
Included: true,
372-
CachePath: featureDir,
373-
Metadata: m.Metadata,
374-
File: m.Metadata,
375-
SourceKeys: features.OCIFeatureKeys,
355+
ID: cmp.Or(m.ID, ref.ID),
356+
Version: m.Version,
357+
Name: m.Name,
358+
Description: m.Description,
359+
DocumentationURL: m.DocumentationURL,
360+
Value: opts,
361+
ValueOrder: optOrder,
362+
UserOptions: extractUserOptions(opts),
363+
Options: m.Options,
364+
DependsOn: m.DependsOn,
365+
DependsOnOrder: m.DependsOnOrder,
366+
InstallsAfter: m.InstallsAfter,
367+
LegacyIds: m.LegacyIds,
368+
ContainerEnv: m.ContainerEnv,
369+
ContainerEnvOrder: m.ContainerEnvOrder,
370+
Init: m.Init,
371+
Privileged: m.Privileged,
372+
CapAdd: m.CapAdd,
373+
SecurityOpt: m.SecurityOpt,
374+
Entrypoint: m.Entrypoint,
375+
Mounts: m.Mounts,
376+
Customizations: m.Customizations,
377+
Included: true,
378+
CachePath: featureDir,
379+
Metadata: m.Metadata,
380+
File: m.Metadata,
381+
SourceKeys: features.OCIFeatureKeys,
376382
}
377383
if feat.Version == "" {
378384
feat.Version = ref.Tag
@@ -588,7 +594,7 @@ func extendImageWithFeatures(
588594
return nil, err
589595
}
590596
}
591-
result, err := fetchFeatureSetsWithOrder(ctx, logger, featuresCfg, localFeatureRoots{fbOpts.FeaturesBasePath, fbOpts.WorkspaceFolder}, lockfile, fbOpts.OverrideFeatureInstallOrder)
597+
result, err := fetchFeatureSetsWithOrder(ctx, logger, featuresCfg, fbOpts.FeatureOptionOrder, localFeatureRoots{fbOpts.FeaturesBasePath, fbOpts.WorkspaceFolder}, lockfile, fbOpts.OverrideFeatureInstallOrder)
592598
if err != nil {
593599
return nil, err
594600
}
@@ -656,6 +662,7 @@ func extendImageWithFeatures(
656662
UseBuildKitContexts: useBuildx,
657663
Syntax: syntax,
658664
ConfigContainerEnv: fbOpts.ContainerEnv,
665+
ConfigEnvOrder: fbOpts.ContainerEnvOrder,
659666
SecretIDs: secretIDs,
660667
CABundle: caSecrets != nil,
661668
})

‎internal/cli/feature_install_held_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ func TestTarballFeatureIDUsesTheURLPath(t *testing.T) {
429429

430430
func TestFetchFeatureSetsReportsTheFirstSortedFailure(t *testing.T) {
431431
for range 5 {
432-
_, err := fetchFeatureSets(t.Context(), log.Null, map[string]any{"./b-missing": true, "./a-missing": true, "./c-missing": true}, devcontainerRoots(t))
432+
_, err := fetchFeatureSets(t.Context(), log.Null, map[string]any{"./b-missing": true, "./a-missing": true, "./c-missing": true}, nil, devcontainerRoots(t))
433433
if err == nil || !strings.Contains(err.Error(), "'./a-missing'") {
434434
t.Fatalf("err = %v, want the failure of ./a-missing", err)
435435
}

‎internal/cli/feature_install_test.go‎

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func TestFetchFeatureSets(t *testing.T) {
148148
t.Run(tt.name, func(t *testing.T) {
149149
roots := devcontainerRoots(t)
150150
tt.setup(t, roots.configDir)
151-
result, err := fetchFeatureSets(t.Context(), log.Null, tt.entries, roots)
151+
result, err := fetchFeatureSets(t.Context(), log.Null, tt.entries, nil, roots)
152152
if result != nil && result.TmpDir != "" {
153153
defer os.RemoveAll(result.TmpDir)
154154
}
@@ -232,7 +232,7 @@ func TestFetchFeatureSets_StagingLayout(t *testing.T) {
232232
if err := os.WriteFile(filepath.Join(dirB, "install.sh"), []byte("#!/bin/sh\n"), 0o755); err != nil {
233233
t.Fatal(err)
234234
}
235-
result, err := fetchFeatureSets(t.Context(), log.Null, map[string]any{"./dir-a": true}, roots)
235+
result, err := fetchFeatureSets(t.Context(), log.Null, map[string]any{"./dir-a": true}, nil, roots)
236236
if err != nil {
237237
t.Fatal(err)
238238
}
@@ -396,7 +396,7 @@ func TestFetchFeatureSetsRefusesLocalFeaturesOutsideDevcontainer(t *testing.T) {
396396
t.Run(tc.id, func(t *testing.T) {
397397
var logs bytes.Buffer
398398
logger := log.New(log.Options{Level: log.LevelInfo, Format: "text", Writer: &logs})
399-
result, err := fetchFeatureSets(t.Context(), logger, map[string]any{tc.id: true}, roots)
399+
result, err := fetchFeatureSets(t.Context(), logger, map[string]any{tc.id: true}, nil, roots)
400400
if result != nil {
401401
t.Fatalf("result = %+v, want none", result)
402402
}
@@ -420,7 +420,7 @@ func TestFetchFeatureSetsRefusesLocalFeaturesOutsideDevcontainer(t *testing.T) {
420420
func TestFetchFeatureSetsMovesDeprecatedFeaturesIntoOptions(t *testing.T) {
421421
var logs bytes.Buffer
422422
logger := log.New(log.Options{Level: log.LevelInfo, Format: "text", Writer: &logs})
423-
result, err := fetchFeatureSets(t.Context(), logger, map[string]any{"gradle": map[string]any{}, "node:18": map[string]any{}}, devcontainerRoots(t))
423+
result, err := fetchFeatureSets(t.Context(), logger, map[string]any{"gradle": map[string]any{}, "node:18": map[string]any{}}, nil, devcontainerRoots(t))
424424
if result != nil || err == nil || err.Error() != fmt.Sprintf(msgLegacyFeature, "node:18") {
425425
t.Fatalf("result = %+v, err = %v; want the legacy Feature error for node:18", result, err)
426426
}
@@ -457,3 +457,54 @@ func TestCreateFeaturesFolderIsTheRunsAlone(t *testing.T) {
457457
seen[dir] = true
458458
}
459459
}
460+
461+
func TestFetchedFeaturesKeepTheDeclaredOrder(t *testing.T) {
462+
roots := devcontainerRoots(t)
463+
write := func(name, metadata string) {
464+
t.Helper()
465+
dir := filepath.Join(roots.configDir, name)
466+
if err := os.MkdirAll(dir, 0o755); err != nil {
467+
t.Fatal(err)
468+
}
469+
if err := os.WriteFile(filepath.Join(dir, "devcontainer-feature.json"), []byte(metadata), 0o644); err != nil {
470+
t.Fatal(err)
471+
}
472+
if err := os.WriteFile(filepath.Join(dir, "install.sh"), []byte("#!/bin/sh\n"), 0o755); err != nil {
473+
t.Fatal(err)
474+
}
475+
}
476+
write("sdk", `{"id": "sdk", "version": "1.0.0",
477+
"options": {"version": {"type": "string", "default": "latest"}},
478+
"containerEnv": {"SDKMAN_DIR": "/usr/local/sdkman", "PATH": "${SDKMAN_DIR}/bin:${PATH}"},
479+
"dependsOn": {"./dep": {"zz": "1", "aa": "2"}}}`)
480+
write("dep", `{"id": "dep", "version": "1.0.0"}`)
481+
482+
result, err := fetchFeatureSets(t.Context(), log.Null,
483+
map[string]any{"./sdk": map[string]any{"zz": "1", "version": "2", "aa": "3"}},
484+
map[string][]string{"./sdk": {"zz", "version", "aa"}}, roots)
485+
if err != nil {
486+
t.Fatal(err)
487+
}
488+
defer os.RemoveAll(result.TmpDir)
489+
if err := stageFeatureBuildFiles(result.TmpDir, result.FeatureSets, "root", "root"); err != nil {
490+
t.Fatal(err)
491+
}
492+
wantEnv := map[string]string{"sdk": "VERSION=\"2\"\nZZ=\"1\"\nAA=\"3\"", "dep": "ZZ=\"1\"\nAA=\"2\""}
493+
for _, set := range result.FeatureSets {
494+
f := set.Features[0]
495+
data, err := os.ReadFile(filepath.Join(f.CachePath, imagemeta.FeatureEnvFile))
496+
if err != nil {
497+
t.Fatal(err)
498+
}
499+
if got := string(data); got != wantEnv[f.ID] {
500+
t.Errorf("%s %s = %q, want %q", f.ID, imagemeta.FeatureEnvFile, got, wantEnv[f.ID])
501+
}
502+
}
503+
504+
dockerfile := imagemeta.GenerateFeaturesBuildOptions(imagemeta.FeaturesBuildParams{
505+
BaseName: "base", FeatureSets: result.FeatureSets, ContainerUser: "root", RemoteUser: "root", UseBuildKitContexts: true,
506+
}).DockerfileContent
507+
if want := "ENV SDKMAN_DIR=\"/usr/local/sdkman\"\nENV PATH=\"${SDKMAN_DIR}/bin:${PATH}\"\n"; !strings.Contains(dockerfile, want) {
508+
t.Errorf("Dockerfile lacks the Feature's ENV lines in declaration order %q:\n%s", want, dockerfile)
509+
}
510+
}

‎internal/cli/features_resolve_deps.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func realFeaturesResolveDepsCmd() *cobra.Command {
3838
}
3939

4040
cfg := loadResult.Config
41-
userFeatures := features.UserFeaturesToArray(cfg.Features)
41+
userFeatures := features.UserFeaturesToArray(cfg.Features, cfg.FeatureOptionOrder)
4242
if len(userFeatures) == 0 {
4343
logger.Write(fmt.Sprintf("Could not parse features object in configuration '%s'", cfg.ConfigFilePath), log.LevelError)
4444
return &coreerrors.ExitCodeError{Code: 1}

‎internal/cli/helpers.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ func mergeAdditionalFeatures(cfg *config.DevContainer, additionalFeaturesJSON st
2929
if _, exists := cfg.Features[k]; !exists {
3030
cfg.Features[k] = v
3131
additionalOnly[k] = true
32+
if names := jsonc.MemberNames([]byte(additionalFeaturesJSON), k); len(names) > 0 {
33+
if cfg.FeatureOptionOrder == nil {
34+
cfg.FeatureOptionOrder = map[string][]string{}
35+
}
36+
cfg.FeatureOptionOrder[k] = names
37+
}
3238
}
3339
}
3440
return additionalOnly, nil

0 commit comments

Comments
 (0)