Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/integration_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,14 @@ jobs:
- integration-upgrades
- integration-policy
- integration-usersync
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Free disk space
uses: canonical/free-disk-space@main
with:
android: true
dotnet: true
haskell: true
- name: Checkout
uses: actions/checkout@v3
- name: Setup operator environment
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote_charm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:

jobs:
promote-charm:
uses: canonical/operator-workflows/.github/workflows/promote_charm.yaml@8892eb826818585b397295e40276ddd0c5d3d459
uses: canonical/operator-workflows/.github/workflows/promote_charm.yaml@main
with:
origin-channel: ${{ github.event.inputs.origin-channel }}
destination-channel: ${{ github.event.inputs.destination-channel }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ on:

jobs:
unit-tests:
uses: canonical/operator-workflows/.github/workflows/test.yaml@8892eb826818585b397295e40276ddd0c5d3d459
uses: canonical/operator-workflows/.github/workflows/test.yaml@main
secrets: inherit
8 changes: 3 additions & 5 deletions .github/workflows/test_and_publish_charm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ on:

jobs:
publish-to-edge:
uses: canonical/operator-workflows/.github/workflows/test_and_publish_charm.yaml@8892eb826818585b397295e40276ddd0c5d3d459
uses: canonical/operator-workflows/.github/workflows/publish_charm.yaml@main
secrets: inherit
with:
integration-test-provider: microk8s
integration-test-provider-channel: 1.28-strict/stable
integration-test-juju-channel: 3.4/stable
integration-test-modules: '["test_charm"]'
channel: latest/edge

5 changes: 2 additions & 3 deletions lib/charms/data_platform_libs/v0/data_interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def _on_topic_requested(self, event: TopicRequestedEvent):

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 40
LIBPATCH = 41

PYDEPS = ["ops>=2.0.0"]

Expand Down Expand Up @@ -609,7 +609,7 @@ def get_group(self, group: str) -> Optional[SecretGroup]:
class CachedSecret:
"""Locally cache a secret.

The data structure is precisely re-using/simulating as in the actual Secret Storage
The data structure is precisely reusing/simulating as in the actual Secret Storage
"""

KNOWN_MODEL_ERRORS = [MODEL_ERRORS["no_label_and_uri"], MODEL_ERRORS["owner_no_refresh"]]
Expand Down Expand Up @@ -2363,7 +2363,6 @@ def _update_relation_data(self, relation: Relation, data: Dict[str, str]) -> Non
def _delete_relation_data(self, relation: Relation, fields: List[str]) -> None:
"""Delete data available (directily or indirectly -- i.e. secrets) from the relation for owner/this_app."""
if self.secret_fields and self.deleted_label:

_, normal_fields = self._process_secret_fields(
relation,
self.secret_fields,
Expand Down
6 changes: 3 additions & 3 deletions lib/charms/data_platform_libs/v0/data_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ class MergedDataBag(ProviderDataBag, RequirerDataBag):

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 4
LIBPATCH = 5

PYDEPS = ["ops>=2.0.0", "pydantic>=1.10,<2"]

Expand Down Expand Up @@ -209,7 +209,7 @@ def validate_params(cls: Type[T]):
"""

def decorator(
f: Callable[[CharmBase, ActionEvent, Union[T, ValidationError]], G]
f: Callable[[CharmBase, ActionEvent, Union[T, ValidationError]], G],
) -> Callable[[CharmBase, ActionEvent], G]:
@wraps(f)
def event_wrapper(self: CharmBase, event: ActionEvent):
Expand Down Expand Up @@ -287,7 +287,7 @@ def decorator(
Optional[Union[UnitModel, ValidationError]],
],
G,
]
],
) -> Callable[[CharmBase, RelationEvent], G]:
@wraps(f)
def event_wrapper(self: CharmBase, event: RelationEvent):
Expand Down
Loading
Loading