Changes for RK042 - Support for Pro Rocks in Rockcraft - 30/01/25 #616

clay-lake · 2025-01-28T16:43:54Z

Have you followed the guidelines for contributing?
Have you signed the CLA?
Have you successfully run tox?

Updates to complete feature set fot RK042 - Support for Pro Rocks in Rockcraft.

These environment variables may be set if the integration tests are run inside a snapped IDE or terminal.

Signed-off-by: Dariusz Duda <[email protected]> Co-authored-by: Tiago Nobrega <[email protected]> Co-authored-by: Michael DuBelko <[email protected]>

This class will hold the implementation that is valid for all non-snap recipe types. For now it's just the previous CharmRecipe - the next commit will do the generalization work.

Subclasses must provide the name of the artifact (charm, rock, etc) and the launchpad object that wraps the utility to manipulate recipes.

Signed-off-by: Dariusz Duda <[email protected]>

* refactor: add _StandardRecipe base class This class will hold the implementation that is valid for all non-snap recipe types. For now it's just the previous CharmRecipe - the next commit will do the generalization work. * refactor: generalize _StandardRecipe Subclasses must provide the name of the artifact (charm, rock, etc) and the launchpad object that wraps the utility to manipulate recipes. --------- Co-authored-by: Alex Lowe <[email protected]>

Fixes canonical#577

build(deps) replace pytest-freezegun with pytest-freezer

Since 3.12.8, argparse 'choices' are no longer quoted. Ref: python/cpython#11776 --------- Co-authored-by: Alex Lowe <[email protected]>

The implementation comes from Charmcraft. This commit has the code changes to make the command craft-tool-agnostic, plus some general test and linting fixes and improvements.

This also adds an utility function, get_recipe_class(), so that client code can be a bit more agnostic on the concrete recipe types (with the notable exception of Snaps).

Snap recipes support defining 'architectures', but charm and rocks don't. Since the remote-build service always passes this parameter, accept it but fail with a good message if the value is not None.

Signed-off-by: Callahan Kovacs <[email protected]>

* chore: bring latest ruff config from starbase * style: autoformat * style(tests): fix linting issues in tests * style(tests): fix linting issues in docs * style: fix linting issues in main code * style: autoformat

Signed-off-by: Dariusz Duda <[email protected]> Co-authored-by: Alex Lowe <[email protected]>

Signed-off-by: Callahan Kovacs <[email protected]> Co-authored-by: Alex Lowe <[email protected]>

Signed-off-by: Callahan Kovacs <[email protected]>

This ensures each platform is built in its own build environment. Signed-off-by: Callahan Kovacs <[email protected]>

Signed-off-by: Callahan Kovacs <[email protected]>

Signed-off-by: Dariusz Duda <[email protected]>

…nical#611) build(deps): update canonical/setup-lxd action to v0.1.2 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Co-authored-by: Callahan <[email protected]>

…hods

…r spec

…naged modes

…nical#615) Signed-off-by: Callahan Kovacs <[email protected]>

build(deps): update bugfixes Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…into feature/pro-sources

…aft-application into feature/pro-sources

This reverts commit 812fad1.

…talled services.

…talled services. Missing addition.

codecov · 2025-02-04T13:43:06Z

Codecov Report

Attention: Patch coverage is 87.47554% with 64 lines in your changes missing coverage. Please review.

Project coverage is 90.37%. Comparing base (2768bb5) to head (4a72dc3).
Report is 2 commits behind head on feature/pro-sources.

Files with missing lines	Patch %	Lines
craft_application/commands/remote.py	74.74%	22 Missing and 3 partials ⚠️
craft_application/services/service_factory.py	83.47%	1 Missing and 19 partials ⚠️
craft_application/launchpad/launchpad.py	66.66%	1 Missing and 3 partials ⚠️
craft_application/launchpad/models/recipe.py	92.15%	3 Missing and 1 partial ⚠️
craft_application/services/remotebuild.py	76.47%	4 Missing ⚠️
craft_application/util/pro_services.py	85.00%	3 Missing ⚠️
craft_application/application.py	90.00%	1 Missing and 1 partial ⚠️
craft_application/errors.py	81.81%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@                   Coverage Diff                   @@
##           feature/pro-sources     #616      +/-   ##
=======================================================
- Coverage                90.47%   90.37%   -0.11%     
=======================================================
  Files                       65       67       +2     
  Lines                     3781     4175     +394     
  Branches                   414      480      +66     
=======================================================
+ Hits                      3421     3773     +352     
- Misses                     288      306      +18     
- Partials                    72       96      +24

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

clay-lake · 2025-02-04T15:59:21Z

Hey, @canonical/starcraft-reviewers @tigarmo Could I get this merged in?

bepri and others added 30 commits December 5, 2024 07:53

tests: clear snap-related environment variables (canonical#564)

f854aac

These environment variables may be set if the integration tests are run inside a snapped IDE or terminal.

feat: extend craft_application.git module (canonical#576)

3a3992b

Signed-off-by: Dariusz Duda <[email protected]> Co-authored-by: Tiago Nobrega <[email protected]> Co-authored-by: Michael DuBelko <[email protected]>

refactor: add _StandardRecipe base class

5c5d2cc

This class will hold the implementation that is valid for all non-snap recipe types. For now it's just the previous CharmRecipe - the next commit will do the generalization work.

refactor: generalize _StandardRecipe

724c648

Subclasses must provide the name of the artifact (charm, rock, etc) and the launchpad object that wraps the utility to manipulate recipes.

feat(ServiceFactory): dynamic service registration (canonical#579)

a86b674

fixup! refactor: generalize _StandardRecipe

8a606f1

feat: add ordered to the add_command_group API (canonical#574)

46ee540

Signed-off-by: Dariusz Duda <[email protected]>

Merge branch 'main' into work/refactor-recipe

668b149

build(deps) replace pytest-freezegun with pytest-freezer

7bb691e

Fixes canonical#577

Merge pull request canonical#578 from canonical/work/577

94f1bdb

build(deps) replace pytest-freezegun with pytest-freezer

fix(tests): fix a test broken in Python 3.12.8 (canonical#595)

689aac6

Since 3.12.8, argparse 'choices' are no longer quoted. Ref: python/cpython#11776 --------- Co-authored-by: Alex Lowe <[email protected]>

feat: add a 'remote-build' command (canonical#586)

6e49d79

The implementation comes from Charmcraft. This commit has the code changes to make the command craft-tool-agnostic, plus some general test and linting fixes and improvements.

feat(launchpad): add RockRecipe

a0c62a2

This also adds an utility function, get_recipe_class(), so that client code can be a bit more agnostic on the concrete recipe types (with the notable exception of Snaps).

fix(launchpad): fail if 'architectures' are provided

b7edfa6

Snap recipes support defining 'architectures', but charm and rocks don't. Since the remote-build service always passes this parameter, accept it but fail with a good message if the value is not None.

docs: finalize changelog for 4.6.0

8dae7e2

feat: allow for multi-base builds (canonical#598)

d81c39a

Signed-off-by: Callahan Kovacs <[email protected]>

chore: use the latest ruff config from starbase (canonical#588)

44b1a94

* chore: bring latest ruff config from starbase * style: autoformat * style(tests): fix linting issues in tests * style(tests): fix linting issues in docs * style: fix linting issues in main code * style: autoformat

feat: add cli and platform utils (canonical#599)

8e9893d

Signed-off-by: Dariusz Duda <[email protected]> Co-authored-by: Alex Lowe <[email protected]>

tests: xfail launchpad endpoint test (canonical#602)

42a76dd

Signed-off-by: Callahan Kovacs <[email protected]> Co-authored-by: Alex Lowe <[email protected]>

chore: add exceptions for stdlib module shadowing (canonical#603)

03fda39

Signed-off-by: Callahan Kovacs <[email protected]>

build(deps): update craft-providers

999e57b

Signed-off-by: Callahan Kovacs <[email protected]>

feat: use platform name in build instance name

5ae7f87

This ensures each platform is built in its own build environment. Signed-off-by: Callahan Kovacs <[email protected]>

ci: build and publish artifacts on amd64 (canonical#604)

96f17af

Signed-off-by: Callahan Kovacs <[email protected]>

fix: do not log encoded secrets (canonical#596)

e958464

Signed-off-by: Dariusz Duda <[email protected]>

fix: only attach pro services if requested

beebf2a

fix: use artifact in fetch-service context (canonical#587)

0ad817c

Signed-off-by: Dariusz Duda <[email protected]>

chore: merge 4.8.2 to main (canonical#608)

e24173b

fix: incorrect validation of non pro managed builds on pro host

5dc2e39

build(deps): update canonical/setup-lxd action to v0.1.2 (main) (cano…

b398a0f

…nical#611) build(deps): update canonical/setup-lxd action to v0.1.2 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

clay-lake and others added 13 commits January 21, 2025 21:15

feat: clean environment on change of pro services. WIP

616d326

ci(renovate): switch to Starflow renovate config (canonical#609)

657d1fe

Co-authored-by: Callahan <[email protected]>

feat: simplify pro state management

b7eb0be

fix(pro_services.py): add docs and types to ProServices load/save met…

905ab8b

…hods

fix(application.py): do not auto clean when pro arg is changed, as pe…

d64c6e3

…r spec

feat: custom InvalidUbuntuProStatusError resolution on destructive/ma…

8453980

…naged modes

fix: adjust pro services validation assertion.

9ce9711

fix(launchpad): use the project's privacy for repos and recipes (cano…

7c7f406

…nical#615) Signed-off-by: Callahan Kovacs <[email protected]>

build(deps): update bugfixes (main) (canonical#610)

959e803

build(deps): update bugfixes Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

refactor: apply black reformat

8ff74a5

Merge branch 'main' of https://github.com/canonical/craft-application …

03fdab8

…into feature/pro-sources

fix:adjustments for linter

caffa22

fix: adjust dependencies for feature branch

46debfc

clay-lake changed the title ~~DRAFT: RK042 - Support for Pro Rocks in Rockcraft~~ Changes for RK042 - Support for Pro Rocks in Rockcraft - 30/01/25 Jan 30, 2025

clay-lake added 7 commits February 3, 2025 22:00

trigger build

b3a1761

fix: humanize_list may not guard against empty iterators

812fad1

Merge branch 'feature/pro-sources' of https://github.com/clay-lake/cr…

0b3f1d8

…aft-application into feature/pro-sources

Revert "fix: humanize_list may not guard against empty iterators"

8103b1e

This reverts commit 812fad1.

fix: remove humanize string call

95322b0

fix(tests/unit/test_application.py): pretend mock instance has no ins…

e404dd5

…talled services.

fix(tests/unit/test_application.py): pretend mock instance has no ins…

680e028

…talled services. Missing addition.

fix(application.py): run black formatter

4a72dc3

clay-lake marked this pull request as ready for review February 4, 2025 15:58

tigarmo merged commit e921232 into canonical:feature/pro-sources Feb 5, 2025
11 of 13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changes for RK042 - Support for Pro Rocks in Rockcraft - 30/01/25 #616

Changes for RK042 - Support for Pro Rocks in Rockcraft - 30/01/25 #616

clay-lake commented Jan 28, 2025 •

edited

Loading

codecov bot commented Feb 4, 2025 •

edited

Loading

clay-lake commented Feb 4, 2025

Changes for RK042 - Support for Pro Rocks in Rockcraft - 30/01/25 #616

Changes for RK042 - Support for Pro Rocks in Rockcraft - 30/01/25 #616

Conversation

clay-lake commented Jan 28, 2025 • edited Loading

codecov bot commented Feb 4, 2025 • edited Loading

Codecov Report

clay-lake commented Feb 4, 2025

clay-lake commented Jan 28, 2025 •

edited

Loading

codecov bot commented Feb 4, 2025 •

edited

Loading