Skip to content

Commit

Permalink
Merge branch '6/edge' into identify-primary-shard
Browse files Browse the repository at this point in the history
  • Loading branch information
MiaAltieri authored Oct 13, 2023
2 parents 389b4c2 + 439c915 commit d4103f7
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 39 deletions.
32 changes: 17 additions & 15 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,23 @@ jobs:
run: python3 -m pip install tox
- name: Run tests
run: tox run -e unit

lib-check:
name: Check libraries
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Check libs
uses: canonical/charming-actions/[email protected]
with:
credentials: "${{ secrets.CHARMHUB_TOKEN }}" # FIXME: current token will expire in 2023-07-04
github-token: "${{ secrets.GITHUB_TOKEN }}"
# current lib check is incompatible with bumped APIs - perform this manually. After merge +
# publish. It should be possible to comment this back in and for the workflow to resume normally.
# see issue: https://github.com/canonical/charming-actions/issues/97
# lib-check:
# name: Check libraries
# runs-on: ubuntu-latest
# timeout-minutes: 5
# steps:
# - name: Checkout
# uses: actions/checkout@v3
# with:
# fetch-depth: 0
# - name: Check libs
# uses: canonical/charming-actions/[email protected]
# with:
# credentials: "${{ secrets.CHARMHUB_TOKEN }}" # FIXME: current token will expire in 2023-07-04
# github-token: "${{ secrets.GITHUB_TOKEN }}"

build:
name: Build charms
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Release any bumped charm libs
uses: canonical/charming-actions/[email protected]
with:
credentials: "${{ secrets.CHARMHUB_TOKEN }}"
github-token: "${{ secrets.GITHUB_TOKEN }}"
# current lib publish is incompatible with bumped APIs - perform this manually. After merge +
# publish. It should be possible to comment this back in and for the workflow to resume
# normally.
# see issue: https://github.com/canonical/charming-actions/issues/97
# - name: Release any bumped charm libs
# uses: canonical/charming-actions/[email protected]
# with:
# credentials: "${{ secrets.CHARMHUB_TOKEN }}"
# github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Upload charm to charmhub
uses: canonical/charming-actions/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions lib/charms/mongodb/v0/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
LIBID = "b9a7fe0c38d8486a9d1ce94c27d4758e"

# Increment this major API version when introducing breaking changes
LIBAPI = 0
LIBAPI = 1

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

# path to store mongodb ketFile
KEY_FILE = "keyFile"
Expand Down
4 changes: 2 additions & 2 deletions lib/charms/mongodb/v0/mongodb.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
LIBID = "49c69d9977574dd7942eb7b54f43355b"

# Increment this major API version when introducing breaking changes
LIBAPI = 0
LIBAPI = 1

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

# path to store mongodb ketFile
logger = logging.getLogger(__name__)
Expand Down
4 changes: 2 additions & 2 deletions lib/charms/mongodb/v0/mongodb_backups.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
LIBID = "18c461132b824ace91af0d7abe85f40e"

# Increment this major API version when introducing breaking changes
LIBAPI = 0
LIBAPI = 1

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

logger = logging.getLogger(__name__)

Expand Down
4 changes: 2 additions & 2 deletions lib/charms/mongodb/v0/mongodb_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
LIBID = "4067879ef7dd4261bf6c164bc29d94b1"

# Increment this major API version when introducing breaking changes
LIBAPI = 0
LIBAPI = 1

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

logger = logging.getLogger(__name__)
REL_NAME = "database"
Expand Down
5 changes: 2 additions & 3 deletions lib/charms/mongodb/v0/mongodb_tls.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@
LIBID = "e02a50f0795e4dd292f58e93b4f493dd"

# Increment this major API version when introducing breaking changes
LIBAPI = 0
LIBAPI = 1

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

logger = logging.getLogger(__name__)

Expand Down
4 changes: 2 additions & 2 deletions lib/charms/mongodb/v0/mongodb_vm_legacy_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
LIBID = "896a48bc89b84d30839335bb37170509"

# Increment this major API version when introducing breaking changes
LIBAPI = 0
LIBAPI = 1

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 4
LIBPATCH = 0
logger = logging.getLogger(__name__)
REL_NAME = "database"

Expand Down
4 changes: 2 additions & 2 deletions lib/charms/mongodb/v0/mongos.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
LIBID = "e20d5b19670d4c55a4934a21d3f3b29a"

# Increment this major API version when introducing breaking changes
LIBAPI = 0
LIBAPI = 1

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

# path to store mongodb ketFile
logger = logging.getLogger(__name__)
Expand Down
4 changes: 2 additions & 2 deletions lib/charms/mongodb/v0/shards_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
LIBID = "55fee8fa73364fb0a2dc16a954b2fd4a"

# Increment this major API version when introducing breaking changes
LIBAPI = 0
LIBAPI = 1

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 3
LIBPATCH = 0
KEYFILE_KEY = "key-file"
HOSTS_KEY = "host"
OPERATOR_PASSWORD_KEY = MongoDBUser.get_password_key_name_for_user(OperatorUser.get_username())
Expand Down
4 changes: 2 additions & 2 deletions lib/charms/mongodb/v0/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
LIBID = "b74007eda21c453a89e4dcc6382aa2b3"

# Increment this major API version when introducing breaking changes
LIBAPI = 0
LIBAPI = 1

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


class MongoDBUser:
Expand Down

0 comments on commit d4103f7

Please sign in to comment.