Skip to content

Conversation

@Mcrich23
Copy link
Contributor

Type of Change

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

Motivation and Context

This is an extension of #603 to cleanup the folder structure and have it match with the new library and target names.

Testing

N/A?

commit 449f1d2
Author: J Logan <[email protected]>
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 <[email protected]>
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 <[email protected]>

commit 79cc363
Author: J Logan <[email protected]>
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 <[email protected]>
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
@jglogan
Copy link
Contributor

jglogan commented Sep 17, 2025

Created #631 to track this PR.

@Mcrich23
Copy link
Contributor Author

This is having major issues cause of /CLI conflicts @jglogan. What do you think is the best strategy to do this?

commit dd6bdc2
Author: Morris Richman <[email protected]>
Date:   Wed Sep 17 15:24:26 2025 -0700

    Expose Command Structs for Plugins (apple#603)

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

    ## Motivation and Context
    Plugins technically exist, but to add shortcuts or to do existing things
    with functions in `container` requires calling a compiled binary. This
    pull request aims to remove that hurdle and instability by exposing
    commands as a new `ContainerCommands ` target.

    Simply import `ContainerCommands` and you can access almost
    any command as if it were a native part of the binary. This makes
    plugin development significantly easier.

    Closes apple#609.
This reverts commit 70fd2a8.
@Mcrich23
Copy link
Contributor Author

Nevermind. I managed to fix it, but the longer we wait to merge this, the harder it will be to do so.

@Mcrich23 Mcrich23 marked this pull request as ready for review September 17, 2025 23:41
@jglogan
Copy link
Contributor

jglogan commented Sep 18, 2025

@Mcrich23 the commit history doesn't look right. It looks like your base commit doesn't include the changes we merged from the last PR. Typically, you'd want to do the following, since you created this change before the merge:

git checkout main
git fetch upstream
git merge upstream/main
git checkout rename-cli-folder
git rebase main
git push -f

That would make it so that just the changes for your PR are rebased onto the current HEAD on main.

It might be easiest in this case to close this PR and delete the branch, and start with a new branch and PR from main.

@Mcrich23
Copy link
Contributor Author

Thats what I am wondering as well. Because this is relatively simple

@Mcrich23
Copy link
Contributor Author

Yes. it is hitting a ton of conflicts. Do you mind if I just do that instead?

@jglogan
Copy link
Contributor

jglogan commented Sep 18, 2025

Definitely. I think it'd be the easiest just to burn this one and start with a fresh branch and PR.

@Mcrich23 Mcrich23 closed this Sep 18, 2025
@Mcrich23 Mcrich23 deleted the rename-cli-folder branch September 18, 2025 02:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants