generated from canonical/starbase
-
Notifications
You must be signed in to change notification settings - Fork 16
fix: correct the way that requested pro services are matched with enabled pro services #581
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
linostar
wants to merge
106
commits into
canonical:feature/pro-sources
Choose a base branch
from
linostar:feature/pro-sources
base: feature/pro-sources
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
106 commits
Select commit
Hold shift + click to select a range
66cda28
docs(changelog): add release notes for 4.1.1
mattculler 15e6ba5
fix(platform): automatically vectorise architectures (#442)
lengau 7584049
fix: fail managed runs if the build plan is empty
tigarmo c55e2d2
fix: provide more info in YAML errors (#433)
lengau 5cc9429
docs: add 4.1.2 to changelog
lengau e146ed5
docs: add environment variables reference (#431)
lengau 9fa2183
feat(provider): use standard library to get proxies (#426)
lengau 828d303
feat: support shell/shell-after and debug in 'pack' (#436)
tigarmo 1384467
feat: replace ServiceFactory.set_kwargs with ServiceFactory.update_kw…
lengau cf58871
feat: add a configuration service (#416)
lengau 0638ec1
build(deps): update dependency pytest-check to v2.4.1 (#446)
renovate[bot] ef939ab
chore: update pre-commit hooks (#441)
lengau 4e1fa0b
build(deps): update dependency sphinx-autobuild to v2024.9.3 (#449)
renovate[bot] 60a5729
build(deps): update dependency mypy to v1.11.2 (#448)
renovate[bot] b3146f0
build(deps): update dependency setuptools to v74 (#447)
renovate[bot] 734d79f
tests: re-enable almalinux tests (#445)
lengau 5ed566c
chore(test): put ids on some hard-to-trigger tests (#451)
lengau 160c237
docs: add changelog for 4.2.0 (#457)
tigarmo bcb0dd4
fix(models): coerce numbers to strings by default (#450)
lengau 04fab14
docs(changelog): add 4.2.1 to changelog
lengau 08f98cb
chore: factor run logic outside of try block
sergiusens af57e66
docs: add 4.2.2 to changelog
lengau ad08aa0
fix: inject aliased snaps into build environment (#467)
mr-cal 6520409
fix(app): get_arg_or_config gets environment correctly
lengau 0c8c337
docs(changelog): add 4.2.3 to changelog
lengau b4cc784
refactor: subclass remote-build errors from CraftError
mr-cal a2e1163
docs(changelog): add 4.2.4 release notes
mr-cal da0e60a
fix(config): warn on snapctl errors (#497)
lengau 7bbbfaf
fix(config): wrap snap config handler in snap check (#499)
lengau 8edef5a
fix(docs): freeze on canonical-sphinx 0.1
lengau 32825dc
docs(changelog): release 4.2.5
lengau e2bf042
build(deps): unpin requests
mr-cal 4382ab5
docs(changelog): add 4.2.6 release notes
mr-cal 76a2ae1
fix: set correct parallel build count in scripts (#517)
mattculler 6657806
build(deps): loosen requests dependency
lengau 122e81b
docs(changelog): add 4.2.7 to changelog
lengau 6b31feb
docs(changelog): add release notes for 4.1.3 (#459)
mr-cal d0b9a1e
feat: add initial FetchService skeleton (#7)
tigarmo 028affe
feat: start the fetch-service (#8)
tigarmo 7b74080
feat: create/teardown fetch-service sessions (#9)
tigarmo cb5e735
feat: configure build instances for fetch-service (#11)
tigarmo dcbdbd1
fix: set REQUESTS_CA_BUNDLE for the fetch-service env. (#16)
tigarmo f1b2802
feat: generate the fetch-service certificate
tigarmo b2680b8
fix: set CARGO_HTTP_CAINFO for the fetch-service env
tigarmo 0f4381b
chore(test): set correct deb mimetype back
tigarmo 4647dda
feat: dump the fetch-service report
tigarmo 5bc8948
feat(fetch): default to creating permissive sessions
tigarmo 3f71ae3
fix: use fetch-service's common dir for certificate
tigarmo 9c0f3ff
chore: log the fetch-service command line
tigarmo de79246
feat: always shutdown the fetch-service
tigarmo 8ff5c42
chore: redirect output of 'apt update'
tigarmo 322af37
style(lint): fix ruff 0.6.0 fetch-service errors
tigarmo 32806af
fix: better error if the fetch-service is missing (#55)
tigarmo a000bc7
feat: add an argument to enable the fetch service (#53)
tigarmo 9bccc7c
feat: proper logging for the fetch-service (#56)
tigarmo 99ed5f5
chore: disable port conflict test (#64)
tigarmo 1d8f5e5
ci: use the default version of lxd for integration tests (#461)
lengau 344c496
feat(provider): add a way to clean existing instances
tigarmo 7432f28
feat: wipe existing instances when using the fetch-service
tigarmo a7d28df
feat: set the fetch-service to idle shutdown
tigarmo fce0652
feat(docs): update partitions docs (#475)
mattculler 2028206
feat: models for the craft manifest (#473)
tigarmo ad448fc
feat: generate project manifest in managed runs
tigarmo f33c70e
feat: create the final craft manifest
tigarmo 9cac2cb
feat: support "--platform" for "clean"
tigarmo d7fbf0e
feat: set GOPROXY=direct in fetch-service runs (#489)
tigarmo 6fa9d4c
feat: allow strict/permissive fetch-service sessions (#490)
tigarmo e18b85f
ci: add security scanning job (#494)
lengau b5de38c
feat: mark the fetch-service integration as experimental (#496)
tigarmo 6bd83bf
feat: add craft-platforms compatibility methods (#495)
lengau cc6bef5
fix(docs): fix docs for canonical-sphinx 0.2 (#498)
lengau bbc94fb
build(deps): update pyright (#515)
lengau 33f6607
build(deps): update bugfixes (#510)
renovate[bot] e4e251f
chore: rename parameter to "--enable-fetch-service"
tigarmo c1cfab6
feat: parse artifact rejection reason
tigarmo 0f411ae
feat: report fetch-service rejections
tigarmo 226757c
docs: changelog for 4.3.0
tigarmo db25396
build(deps): update bugfixes (#523)
renovate[bot] 6374b35
build(deps): update dependency setuptools to v75 (#526)
renovate[bot] 9c53248
build(deps): update dependency sphinx-autobuild to v2024.10.3 (#524)
renovate[bot] faabd24
build(deps): update dependency tox-gh to v1.4.4 (#525)
renovate[bot] 66d64db
build(deps): update dependency sphinx-lint to v1 (#527)
renovate[bot] db98e28
build(deps): update dependency setuptools to v75.2.0 (#535)
renovate[bot] fb5f282
build(deps): update dependency pyright to v1.1.385 (#532)
renovate[bot] 812224c
build(deps): update dependency mypy to v1.12.0 (#533)
renovate[bot] 19bdd2c
chore(ci): generate release notes when publishing (#538)
tigarmo 0e477a1
feat: pass the app_config to pre_parse_args() (#541)
tigarmo abe2ca9
chore: log snap installation method (#539)
mr-cal 9c99bae
feat: add init service and init command (#522)
mr-cal 2177890
fix: don't start the fetch-service in managed mode (#542)
tigarmo 4211b24
fix: cleanup UI for fetch-service-related commands (#544)
tigarmo 854813c
feat(application): merge commands within groups (#545)
mr-cal 862ff3d
docs(changelog): add 4.4.0 release notes (#553)
mr-cal 28e238e
chore: use 'candidate' fetch-service (#547)
tigarmo 9a7637a
build(deps): bump minimum craft-cli to 2.10.1
tigarmo 2bc1acc
feat: generate version for templates usage (#548)
dariuszd21 d6aba6b
feat: add documentation link in help messages (#557)
mr-cal cf93e50
ci(rtd): pin python version to 3.12 (#562)
dariuszd21 9b58e55
chore(lint): get around a Pydantic 2.10.x type bug (#566)
tigarmo 78dbc99
feat: improve name handling in 'init' (#567)
tigarmo a2c2032
fix: properly log the fetch-service's output (#555)
tigarmo a06176c
docs: finish changelog for 4.5.0 (#570)
tigarmo e6b1b47
fix: allow building non-Pro rocks on a Pro host in managed mode
87a12fc
fix linting errors
d00a445
fix unit test
2d34504
fail only when requested service is not available in available_services
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
name: Security scan | ||
on: | ||
pull_request: | ||
push: | ||
branches: | ||
- main | ||
- hotfix/* | ||
- work/secscan # For development | ||
|
||
jobs: | ||
python-scans: | ||
name: Scan Python project | ||
uses: canonical/starflow/.github/workflows/scan-python.yaml@main | ||
with: | ||
packages: python-apt-dev |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,10 +60,6 @@ jobs: | |
3.10 | ||
3.12 | ||
cache: 'pip' | ||
- name: Setup LXD | ||
uses: canonical/[email protected] | ||
with: | ||
channel: latest/stable | ||
- name: Configure environment | ||
run: | | ||
echo "::group::apt-get" | ||
|
@@ -111,10 +107,12 @@ jobs: | |
cache: 'pip' | ||
- name: Setup LXD | ||
uses: canonical/[email protected] | ||
with: | ||
channel: latest/stable | ||
- name: Configure environment | ||
run: | | ||
echo "::group::Begin snap install" | ||
echo "Installing snaps in the background while running apt and pip..." | ||
sudo snap install --no-wait --channel=candidate fetch-service | ||
echo "::endgroup::" | ||
echo "::group::apt-get" | ||
sudo apt update | ||
sudo apt-get install -y libapt-pkg-dev | ||
|
@@ -123,6 +121,9 @@ jobs: | |
python -m pip install tox | ||
echo "::endgroup::" | ||
mkdir -p results | ||
echo "::group::Wait for snap to complete" | ||
snap watch --last=install | ||
echo "::endgroup::" | ||
- name: Setup Tox environments | ||
run: tox run -e integration-${{ matrix.python }} --notest | ||
- name: Integration tests | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ sphinx: | |
build: | ||
os: ubuntu-22.04 | ||
tools: | ||
python: "3" | ||
python: "3.12" | ||
|
||
python: | ||
install: | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# This file is part of craft-application. | ||
# | ||
# Copyright 2024 Canonical Ltd. | ||
# | ||
# This program is free software: you can redistribute it and/or modify it | ||
# under the terms of the GNU Lesser General Public License version 3, as | ||
# published by the Free Software Foundation. | ||
# | ||
# This program is distributed in the hope that it will be useful, but WITHOUT | ||
# ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, | ||
# SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. | ||
# See the GNU Lesser General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU Lesser General Public License | ||
# along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
"""Configuration model for craft applications.""" | ||
from __future__ import annotations | ||
|
||
import craft_cli | ||
import pydantic | ||
|
||
|
||
class ConfigModel(pydantic.BaseModel): | ||
"""A configuration model for a craft application.""" | ||
|
||
verbosity_level: craft_cli.EmitterMode = craft_cli.EmitterMode.BRIEF | ||
debug: bool = False | ||
build_environment: str | None = None | ||
secrets: str | ||
|
||
platform: str | None = None | ||
build_for: str | None = None | ||
|
||
parallel_build_count: int | ||
max_parallel_build_count: int | ||
lxd_remote: str = "local" | ||
launchpad_instance: str = "production" |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like it comes from our changes to
main
, right? If so, could you separately mergemain
to this feature branch so the PR is cleaner?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lengau I put the changes from main in seperate PR #582. Please merge that one first.