store: fix issues with promote-bundle command (#1089)

No new tests because this fixes breakage of a spread test that wasn't
running properly

Author: lengau

.github/workflows/spread.yaml

@@ -94,8 +94,8 @@ jobs:
         name: Run spread
         env:
           CHARMCRAFT_AUTH: ${{ secrets.CHARMCRAFT_AUTH }}
-          CHARM_DEFAULT_NAME: charmcraft-ci-test-charm
-          BUNDLE_DEFAULT_NAME: charmcraft-ci-test-bundle
+          CHARM_DEFAULT_NAME: test-ci-charmcraft-charm
+          BUNDLE_DEFAULT_NAME: test-ci-charmcraft-bundle
         run: |
           spread google:ubuntu-22.04-64:tests/spread/store/
 

charmcraft/commands/store/__init__.py

@@ -966,17 +966,17 @@ def run(self, parsed_args: "Namespace") -> None:
             )
 
         # Export a temporary bundle file with the charms in the target channel
-        with tempfile.TemporaryDirectory() as bundle_dir:
-            bundle_dir_path = pathlib.Path(bundle_dir)
-            shutil.copy(self.config.project_dir, bundle_dir_path)
+        with tempfile.TemporaryDirectory(prefix="charmcraft-") as bundle_dir:
+            bundle_dir_path = pathlib.Path(bundle_dir) / bundle_name
+            shutil.copytree(self.config.project.dirpath, bundle_dir_path)
             bundle_path = bundle_dir_path / "bundle.yaml"
             with bundle_path.open("w+") as bundle_file:
                 yaml.dump(bundle_config, bundle_file)
 
             # Pack the bundle using the modified bundle file
             emit.verbose(f"Packing temporary bundle in {bundle_dir}...")
             lifecycle = parts.PartsLifecycle(
-                bundle_config,
+                {},
                 work_dir=bundle_dir_path / "build",
                 project_dir=bundle_dir_path,
                 project_name=bundle_name,
@@ -991,12 +991,12 @@ def run(self, parsed_args: "Namespace") -> None:
             from charmcraft.manifest import create_manifest
 
             create_manifest(lifecycle.prime_dir, self.config.project.started_at, None, [])
-            zipname = self.config.project.dirpath / (bundle_name + ".zip")
+            zipname = bundle_dir_path / (bundle_name + ".zip")
             build_zip(zipname, lifecycle.prime_dir)
 
             # Upload the bundle and release it to the target channel.
-            store.upload(self.config.name, bundle_path)
-        store.release(self.config.name, bundle_revision, parsed_args.to_channel, [])
+            store.upload(bundle_name, zipname)
+        store.release(bundle_name, bundle_revision, [parsed_args.to_channel], [])
 
 
 class CloseCommand(BaseCommand):

charmcraft/commands/store/store.py

@@ -347,7 +347,7 @@ def list_revisions(self, name):
         return result
 
     @_store_client_wrapper()
-    def release(self, name, revision, channels, resources):
+    def release(self, name: str, revision: int, channels: List[str], resources):
         """Release one or more revisions for a package."""
         endpoint = "/v1/charm/{}/releases".format(name)
         resources = [{"name": res.name, "revision": res.revision} for res in resources]

spread.yaml

@@ -169,6 +169,6 @@ suites:
       # to not flood Charmhub with names the same two are always used in the Store related
       # tests (except in the names registration tests, of course); register them manually
       # in staging Charmhub authenticating with the configured credentials
-      CHARM_DEFAULT_NAME: "$(HOST: echo ${SPREAD_CHARM_NAME:-$USER-test-charm})"
-      BUNDLE_DEFAULT_NAME: "$(HOST: echo ${SPREAD_BUNDLE_NAME:-$USER-test-bundle})"
+      CHARM_DEFAULT_NAME: "$(HOST: echo ${CHARM_DEFAULT_NAME:-$USER-test-charm})"
+      BUNDLE_DEFAULT_NAME: "$(HOST: echo ${BUNDLE_DEFAULT_NAME:-$USER-test-bundle})"
 

tests/spread/store/bundle-upload-and-release/task.yaml

@@ -30,7 +30,7 @@ prepare: |
 
   # If necessary, try to register the bundle.
   if ! charmcraft status $BUNDLE_DEFAULT_NAME; then
-    if ! charmcraft register $BUNDLE_DEFAULT_NAME; then
+    if ! charmcraft register-bundle $BUNDLE_DEFAULT_NAME; then
       ERROR Charm $BUNDLE_DEFAULT_NAME cannot be registered to this account.
     fi
   fi
@@ -70,7 +70,9 @@ execute: |
   # Test promotion to beta
   beta_release=$(charmcraft status $BUNDLE_DEFAULT_NAME --format=json | jq -r '.[] | select(.track=="latest") | .mappings[0].releases | .[] | select(.channel=="latest/beta")')
   old_beta_revision=$(echo $beta_release | jq -r .revision)
-  test $old_beta_revision -le $edge_revision
+  if [[ $old_beta_revision != null ]]; then  # If there's no beta revision, skip this check.
+    test $old_beta_revision -le $edge_revision
+  fi
   charmcraft promote-bundle latest/edge latest/beta
   beta_release=$(charmcraft status $BUNDLE_DEFAULT_NAME --format=json | jq -r '.[] | select(.track=="latest") | .mappings[0].releases | .[] | select(.channel=="latest/beta")')
   beta_revision=$(echo $beta_release | jq -r .revision)