Skip to content

Replace scattered defaults subcommands with system property.#604

Merged
jglogan merged 3 commits intoapple:mainfrom
jglogan:property-cli
Sep 16, 2025
Merged

Replace scattered defaults subcommands with system property.#604
jglogan merged 3 commits intoapple:mainfrom
jglogan:property-cli

Conversation

@jglogan
Copy link
Contributor

@jglogan jglogan commented Sep 12, 2025 •
edited
Loading

Common subcommands for all defaults.

  • Closes [Request]: Minimal feature set for common defaults management. #384.
  • Replaces registry default and system dns default subcommands with system property.
  • Users can use system property ls to see details about each supported default value.
  • system property set implements reasonable validation for all properties.
  • NOTE: Probing of the registry for registry default set was removed, which means users will find out about a botched setting when pulling or pushing.
  • Updates docs.

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

See #384.

Testing

  • Tested locally
  • Added/updated tests
  • Added/updated docs

@jglogan jglogan marked this pull request as draft September 12, 2025 02:16
@jglogan jglogan changed the title Property cli Replace scattered defaults subcommands with system property. Sep 12, 2025
@jglogan
Common subcommands for all defaults.
1eb367d 
- Replaces `registry default` and `system dns default`
  subcommands with `system property`.
- Users can use `system property ls` to see details
  about each supported default value.
- `system property set` implements reasonable validation
  for all properties.
- NOTE: Probing of the registry for `registry default set`
  was removed, which means users will find out about a
  botched setting when pulling or pushing.
@jglogan
Update docs.
9c1da8a 
- Updated all documentation to use the new property commands instead
  of macOS defaults or individual default subcommands.
@jglogan jglogan marked this pull request as ready for review September 13, 2025 00:48
This was referenced Sep 13, 2025
Open
Closed
adityaramani
adityaramani reviewed Sep 16, 2025
View reviewed changes
Sources/CLI/System/Property/PropertySet.swift Outdated
}
DefaultsStore.set(value: value, key: key)
case .defaultBuilderImage, .defaultInitImage:
guard (try? Reference(path: value)) != nil else {
Copy link
Contributor

@adityaramani adityaramani Sep 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be (try? Reference.parse(value)) != nil

Copy link
Contributor Author

@jglogan jglogan Sep 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

adityaramani
adityaramani approved these changes Sep 16, 2025
View reviewed changes
Copy link
Contributor

@adityaramani adityaramani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just had one comment - rest looks good

@jglogan
PR feedback.
a59709a 
- Use the correct reference constructor.
- Fix missing DefaultsStore set for kernel URL.
@jglogan jglogan merged commit 449f1d2 into apple:main Sep 16, 2025
2 checks passed
@jglogan jglogan deleted the property-cli branch September 16, 2025 20:41
Mcrich23 added a commit to Mcrich23/container that referenced this pull request Sep 17, 2025
@Mcrich23
Squashed commit of the following:
b1d2020 
commit 449f1d2
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date:   Tue Sep 16 13:37:55 2025 -0700

    Replace scattered defaults subcommands with `system property`. (apple#604)

    Common subcommands for all defaults.

    - Closes apple#384.
    - Replaces `registry default` and `system dns default` subcommands with
    `system property`.
    - Users can use `system property ls` to see details about each supported
    default value.
    - `system property set` implements reasonable validation for all
    properties.
    - NOTE: Probing of the registry for `registry default set` was removed,
    which means users will find out about a botched setting when pulling or
    pushing.
    - Updates docs.

    ## Type of Change
    - [ ] Bug fix
    - [x] New feature
    - [x] Breaking change
    - [x] Documentation update

    ## Motivation and Context
    See apple#384.

    ## Testing
    - [x] Tested locally
    - [x] Added/updated tests
    - [x] Added/updated docs

commit 386fd87
Author: Kathryn Baldauf <k_baldauf@apple.com>
Date:   Tue Sep 16 10:52:08 2025 -0700

    Enumerate using relative paths to avoid mismatch with symlink resolution of special paths like /tmp (apple#613)

    ## Type of Change
    - [x] Bug fix
    - [ ] New feature
    - [ ] Breaking change
    - [ ] Documentation update

    ## Motivation and Context
    Fixes apple#588. This PR changes the
    archiver compression file enumeration to use the
    [enumerator(atPath:)](https://developer.apple.com/documentation/foundation/filemanager/enumerator(atpath:))
    version. This version returns relative paths instead of full file paths
    from the filesystem. /tmp is symlinked to /private/tmp and some swift
    packages will handle that path differently. While a call to Foundation's
    `URL.resolvingSymlinksInPath()` will return "/tmp", a call to
    `FileManager.enumerator(at:)` will return "/private/tmp". This
    difference causes a container image build to fail when the user is using
    a path under /tmp or other special case paths as the context directory.

    ## Testing
    - [x] Tested locally
    - [x] Added/updated tests
    - [ ] Added/updated docs

    Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>

commit 79cc363
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date:   Tue Sep 16 10:14:14 2025 -0700

    Relocates API server to Helpers, service to Services. (apple#616)

    - Closes apple#615.

    Improves project organization. Separates service so it can be tested and
    used separately from the executable target. No functional changes.

commit a54be36
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date:   Mon Sep 15 11:27:51 2025 -0700

    Add `--labels` for networks. (apple#600)

    - Closes apple#557.
    - Breaking change: removes `.upToNextOption` for labels on volumes as
    this is not what is done for containers, and it forces the argument to
    precede the options if a label is supplied, which is non-intuitive.

    ## Type of Change
    - [ ] Bug fix
    - [x] New feature
    - [x] Breaking change
    - [x] Documentation update

    ## Motivation and Context
    Consistent features and UX across managed resources.

    ## Testing
    - [x] Tested locally
    - [x] Added/updated tests
    - [x] Added/updated docs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@adityaramani adityaramani adityaramani approved these changes

@katiewasnothere katiewasnothere katiewasnothere approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Request]: Minimal feature set for common defaults management.

3 participants

@jglogan @adityaramani @katiewasnothere

Comments