From 65c2ac0e8106de145103e00c4c6a49fffe2b27e4 Mon Sep 17 00:00:00 2001 From: Kelvin Liu Date: Tue, 15 Aug 2023 17:54:10 +1000 Subject: [PATCH 1/7] Add Kelvin signing key; --- allowed_signers | 2 ++ 1 file changed, 2 insertions(+) diff --git a/allowed_signers b/allowed_signers index e5023f673257..d76816a9a6c8 100644 --- a/allowed_signers +++ b/allowed_signers @@ -7,3 +7,5 @@ john@arbash-meinel.com namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHu5 stickupkid@gmail.com namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPqO5HpXaSh6MJ9FVt8nyoxhWN+AqlFxIXE68JGrRysb stickupkid@gmail.com stickupkid@gmail.com namespaces="git" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDwmnwQng7gaXz47aRDnNTo7i2iTKq7BMnl+UwuXA/Mubrvtrc/XrcixNNm7iS7khVValIc1bIf1m7oTBp72rFWyuZ5FLDgVsjYn8nFfv3g9HlGlGOyN76xX6gOyGfcGCWWKvUPpuX3DjKDm2z8a95lbYZVjXL7ViqVTXnu2G6c7PnbHTTL+n0IO+5hzdXyq7UxAc+T+sfIdCTC7ru8mY+31CP6ovbEMBf37Qowjp9SIUxqj4nMeRjKUFB0XnkFLBuFWqZq1kIcSTSNMWjEK6b6W/dRWfQ6gsQ4Ybe/8HEKoB9IuOy9HcdZT9H97LCSkQHUgma/kB89NO/YV59STksD stickupkid@gmail.com vitaly.antonenko@canonical.com namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMA/Wg23FBdk2ui9BQPcjzqlN5OjHZgXJ3471LssH4ko anvial-git-signing-key +kelvin.liu@canonical.com namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFSGIXtXjfQq2CZuc50xrcRY5xcRSAME/pnPTjv5e+LD kelvin-signing-key +kelvin.liu@canonical.com namespaces="git" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCZjSCnVEPOxZICHcHTVjFhKuRcEUIqB2xDSXgimDL9lJdngTHPtkLiLBki8dxAzDOsKYFiQm2XK5vLNjhwa71SwYKHONZZta4Lqg/4/qYRhVn9cd+bcrhMjOcl/m0/APRyKQjhXVMD3k5WiECINLvICCObJfjTKV0J6AZJJbsfwTXfoR6Xo95K2xvb8dxIS9jsp6kd1B0jdr6K6bO16IMrMiLCfLwS4ABEaOmE31iowQF2SvRFNeYkywEewYk+DKS7uB14vgEOmWRwx1XUE/doI+084LcZ03KCWhIr7OjwvLKdTkWMj+HF77vNyj1FphUzRs+qyRgus6feTOpvYlWj kelvin.liu@canonical.com From a913ad90ce3552be9c9d22660fcd0072dd301947 Mon Sep 17 00:00:00 2001 From: Jack Shaw Date: Tue, 15 Aug 2023 13:11:08 +0100 Subject: [PATCH 2/7] Rev juju/charm to v11 --- api/agent/caasoperator/client.go | 2 +- api/agent/uniter/charm.go | 2 +- api/agent/uniter/charm_test.go | 2 +- api/agent/uniter/endpoint.go | 2 +- api/agent/uniter/relation.go | 2 +- api/agent/uniter/relation_test.go | 2 +- api/agent/uniter/relationunit_test.go | 2 +- api/agent/uniter/unit.go | 2 +- api/agent/uniter/unit_test.go | 2 +- api/agent/uniter/uniter.go | 2 +- api/client/application/client.go | 2 +- api/client/application/client_test.go | 2 +- api/client/applicationoffers/client.go | 2 +- api/client/applicationoffers/client_test.go | 2 +- api/client/charms/client.go | 4 ++-- api/client/charms/client_test.go | 4 ++-- api/client/charms/downloader.go | 2 +- api/client/charms/downloader_test.go | 2 +- api/client/client/client_macaroon_test.go | 2 +- api/client/payloads/client_test.go | 2 +- api/client/payloads/helpers.go | 2 +- api/client/payloads/helpers_test.go | 2 +- api/client/resources/client.go | 4 ++-- api/client/resources/client_upload_test.go | 4 ++-- api/client/resources/helpers.go | 2 +- api/client/resources/helpers_test.go | 2 +- api/client/resources/upload.go | 2 +- api/common/charm/charmorigin.go | 2 +- api/common/charm/charmorigin_test.go | 2 +- api/common/charms/common.go | 6 +++--- api/common/charms/common_test.go | 4 ++-- api/controller/caasapplicationprovisioner/client.go | 2 +- api/controller/caasapplicationprovisioner/client_test.go | 2 +- api/controller/migrationmaster/client.go | 2 +- api/controller/migrationmaster/client_test.go | 2 +- api/controller/migrationtarget/client.go | 2 +- api/controller/migrationtarget/client_test.go | 2 +- api/watcher/watcher_test.go | 2 +- apiserver/charms.go | 2 +- apiserver/charms_test.go | 2 +- apiserver/common/charms/appcharminfo_test.go | 2 +- apiserver/common/charms/charminfo_test.go | 2 +- apiserver/common/charms/common.go | 4 ++-- apiserver/common/charms/mocks/mocks.go | 2 +- apiserver/common/crossmodel/interface.go | 2 +- apiserver/common/firewall/firewall.go | 2 +- apiserver/common/firewall/firewall_test.go | 2 +- apiserver/common/unitstatus.go | 2 +- apiserver/facades/agent/caasapplication/state.go | 2 +- apiserver/facades/agent/caasoperator/mock_test.go | 2 +- apiserver/facades/agent/caasoperator/operator.go | 2 +- apiserver/facades/agent/caasoperator/state.go | 2 +- apiserver/facades/agent/instancemutater/instancemutater.go | 2 +- .../facades/agent/instancemutater/instancemutater_test.go | 2 +- apiserver/facades/agent/instancemutater/interface.go | 2 +- .../facades/agent/instancemutater/lxdprofilewatcher.go | 2 +- .../facades/agent/instancemutater/lxdprofilewatcher_test.go | 2 +- .../agent/instancemutater/mocks/instancemutater_mock.go | 2 +- apiserver/facades/agent/instancemutater/shim.go | 2 +- .../facades/agent/payloadshookcontext/unitfacade_test.go | 2 +- apiserver/facades/agent/provisioner/interface.go | 2 +- apiserver/facades/agent/provisioner/mocks/package_mock.go | 2 +- apiserver/facades/agent/provisioner/provisioner_test.go | 2 +- apiserver/facades/agent/provisioner/shim.go | 2 +- apiserver/facades/agent/uniter/goal-state_test.go | 2 +- apiserver/facades/agent/uniter/mocks/newlxdprofile.go | 2 +- apiserver/facades/agent/uniter/networkinfo_test.go | 2 +- apiserver/facades/agent/uniter/newlxdprofile.go | 2 +- apiserver/facades/agent/uniter/newlxdprofile_test.go | 2 +- .../facades/agent/uniter/subordinaterelationwatcher.go | 2 +- apiserver/facades/agent/uniter/uniter.go | 2 +- apiserver/facades/agent/uniter/uniter_test.go | 2 +- apiserver/facades/client/application/application.go | 2 +- apiserver/facades/client/application/application_test.go | 2 +- .../facades/client/application/application_unit_test.go | 4 ++-- apiserver/facades/client/application/backend.go | 2 +- apiserver/facades/client/application/deploy.go | 4 ++-- apiserver/facades/client/application/deploy_test.go | 2 +- apiserver/facades/client/application/get.go | 2 +- apiserver/facades/client/application/get_test.go | 2 +- .../facades/client/application/mocks/application_mock.go | 2 +- .../facades/client/application/mocks/lxdprofile_mock.go | 4 ++-- apiserver/facades/client/application/package_test.go | 2 +- .../facades/client/application/updateseries_mocks_test.go | 2 +- apiserver/facades/client/application/updateseries_test.go | 2 +- .../client/applicationoffers/applicationoffers_test.go | 2 +- apiserver/facades/client/applicationoffers/base.go | 2 +- apiserver/facades/client/applicationoffers/base_test.go | 2 +- apiserver/facades/client/applicationoffers/mock_test.go | 2 +- apiserver/facades/client/applicationoffers/state.go | 2 +- apiserver/facades/client/bundle/bundle.go | 4 ++-- apiserver/facades/client/bundle/bundle_test.go | 4 ++-- apiserver/facades/client/bundle/mock_test.go | 2 +- apiserver/facades/client/bundle/state.go | 2 +- apiserver/facades/client/charms/client.go | 2 +- apiserver/facades/client/charms/client_test.go | 2 +- apiserver/facades/client/charms/clientnormalize_test.go | 2 +- apiserver/facades/client/charms/conversions.go | 2 +- apiserver/facades/client/charms/interface.go | 2 +- apiserver/facades/client/charms/interfaces/downloader.go | 2 +- apiserver/facades/client/charms/interfaces/state.go | 2 +- apiserver/facades/client/charms/mocks/repository.go | 4 ++-- apiserver/facades/client/charms/mocks/state_mock.go | 2 +- apiserver/facades/client/charms/services/interfaces.go | 2 +- .../facades/client/charms/services/mocks/interface_mocks.go | 2 +- apiserver/facades/client/charms/services/storage.go | 2 +- apiserver/facades/client/charms/services/storage_test.go | 2 +- apiserver/facades/client/client/api_test.go | 2 +- apiserver/facades/client/client/backend.go | 2 +- apiserver/facades/client/client/client_test.go | 2 +- apiserver/facades/client/client/mocks/client_mock.go | 2 +- apiserver/facades/client/client/perm_test.go | 2 +- apiserver/facades/client/client/status.go | 2 +- apiserver/facades/client/client/testing/suite.go | 2 +- apiserver/facades/client/controller/backend.go | 2 +- apiserver/facades/client/controller/mocks/state_mock.go | 2 +- .../facades/client/machinemanager/machinemanager_test.go | 2 +- apiserver/facades/client/machinemanager/mocks/types_mock.go | 2 +- apiserver/facades/client/machinemanager/state.go | 2 +- .../facades/client/machinemanager/upgradeseries_test.go | 2 +- apiserver/facades/client/metricsdebug/metricsdebug.go | 2 +- apiserver/facades/client/modelgeneration/interface.go | 2 +- .../facades/client/modelgeneration/mocks/package_mock.go | 2 +- apiserver/facades/client/modelgeneration/shim.go | 2 +- apiserver/facades/client/payloads/facade_test.go | 2 +- apiserver/facades/client/resources/base_test.go | 2 +- apiserver/facades/client/resources/facade.go | 4 ++-- apiserver/facades/client/resources/mocks/backend.go | 2 +- apiserver/facades/client/resources/package_test.go | 4 ++-- apiserver/facades/client/resources/repository.go | 4 ++-- apiserver/facades/client/resources/repository_test.go | 4 ++-- .../facades/client/resources/server_addpending_test.go | 4 ++-- .../facades/client/resources/server_listresources_test.go | 2 +- apiserver/facades/client/resources/server_test.go | 2 +- apiserver/facades/client/storage/mock_test.go | 2 +- .../controller/caasapplicationprovisioner/mock_test.go | 2 +- .../controller/caasapplicationprovisioner/provisioner.go | 2 +- .../caasapplicationprovisioner/provisioner_test.go | 4 ++-- .../facades/controller/caasapplicationprovisioner/state.go | 2 +- .../facades/controller/caasfirewaller/firewaller_test.go | 2 +- apiserver/facades/controller/caasfirewaller/mock_test.go | 2 +- .../facades/controller/caasoperatorprovisioner/mock_test.go | 2 +- .../controller/caasoperatorprovisioner/provisioner.go | 2 +- .../controller/caasoperatorprovisioner/provisioner_test.go | 2 +- .../facades/controller/caasunitprovisioner/mock_test.go | 2 +- .../facades/controller/caasunitprovisioner/provisioner.go | 2 +- .../controller/caasunitprovisioner/provisioner_test.go | 2 +- .../controller/charmdownloader/charmdownloader_test.go | 2 +- apiserver/facades/controller/charmdownloader/interfaces.go | 2 +- apiserver/facades/controller/charmdownloader/mocks/mocks.go | 2 +- apiserver/facades/controller/charmdownloader/shims.go | 2 +- .../facades/controller/charmrevisionupdater/charmhub.go | 2 +- .../facades/controller/charmrevisionupdater/interface.go | 2 +- .../controller/charmrevisionupdater/interface_test.go | 4 ++-- .../facades/controller/charmrevisionupdater/mocks/mocks.go | 2 +- .../facades/controller/charmrevisionupdater/updater.go | 4 ++-- .../facades/controller/charmrevisionupdater/updater_test.go | 4 ++-- .../controller/crossmodelrelations/crossmodelrelations.go | 2 +- .../crossmodelrelations/crossmodelrelations_test.go | 2 +- .../controller/remoterelations/remoterelations_test.go | 2 +- apiserver/mocks/resources_mock.go | 2 +- apiserver/resources.go | 2 +- apiserver/resources_mig.go | 2 +- apiserver/resources_mig_test.go | 2 +- apiserver/resources_test.go | 2 +- apiserver/rest_test.go | 2 +- apiserver/testing/application.go | 2 +- caas/kubernetes/provider/bootstrap.go | 2 +- caas/kubernetes/provider/operator_upgrade.go | 2 +- caas/kubernetes/provider/providerconfig.go | 2 +- charmhub/client.go | 2 +- charmhub/download.go | 2 +- cloudconfig/instancecfg/instancecfg.go | 2 +- cloudconfig/podcfg/image.go | 2 +- cloudconfig/podcfg/image_test.go | 2 +- cloudconfig/userdatacfg_test.go | 2 +- cloudconfig/userdatacfg_unix.go | 2 +- cmd/juju/action/common.go | 2 +- cmd/juju/agree/agree/agree.go | 2 +- cmd/juju/application/bundle/bundle.go | 2 +- cmd/juju/application/bundle/bundle_test.go | 2 +- cmd/juju/application/bundle/interface.go | 2 +- cmd/juju/application/bundle/mocks/bundledatasource_mock.go | 2 +- cmd/juju/application/bundle_test.go | 2 +- cmd/juju/application/deploy.go | 2 +- cmd/juju/application/deploy_test.go | 4 ++-- cmd/juju/application/deployer/bundle.go | 2 +- cmd/juju/application/deployer/bundlehandler.go | 4 ++-- cmd/juju/application/deployer/bundlehandler_test.go | 4 ++-- cmd/juju/application/deployer/charm.go | 2 +- cmd/juju/application/deployer/charm_test.go | 4 ++-- cmd/juju/application/deployer/deployer.go | 4 ++-- cmd/juju/application/deployer/deployer_test.go | 4 ++-- cmd/juju/application/deployer/interface.go | 4 ++-- cmd/juju/application/deployer/lxdprofilestep.go | 2 +- cmd/juju/application/deployer/lxdprofilestep_test.go | 2 +- cmd/juju/application/deployer/mocks/charm_mock.go | 4 ++-- cmd/juju/application/deployer/mocks/deploy_mock.go | 4 ++-- cmd/juju/application/deployer/mocks/resolver_mock.go | 2 +- cmd/juju/application/deployer/package_test.go | 2 +- cmd/juju/application/deployer/resource.go | 2 +- cmd/juju/application/diffbundle.go | 2 +- cmd/juju/application/diffbundle_test.go | 2 +- cmd/juju/application/export_test.go | 2 +- cmd/juju/application/refresh.go | 2 +- cmd/juju/application/refresh_test.go | 4 ++-- cmd/juju/application/refresher/charm_mock_test.go | 4 ++-- cmd/juju/application/refresher/interface.go | 2 +- cmd/juju/application/refresher/package_test.go | 2 +- cmd/juju/application/refresher/refresher.go | 2 +- cmd/juju/application/refresher/refresher_mock_test.go | 2 +- cmd/juju/application/refresher/refresher_test.go | 2 +- cmd/juju/application/refresher/store_mock_test.go | 2 +- cmd/juju/application/store/charmadapter.go | 2 +- cmd/juju/application/store/charmadapter_test.go | 2 +- cmd/juju/application/store/interface.go | 2 +- cmd/juju/application/store/mocks/charm_mock.go | 4 ++-- cmd/juju/application/store/mocks/store_mock.go | 2 +- cmd/juju/application/store/package_test.go | 2 +- cmd/juju/application/store/resolve.go | 2 +- cmd/juju/application/store/store.go | 2 +- cmd/juju/application/store/store_test.go | 2 +- cmd/juju/application/unexpose_test.go | 2 +- cmd/juju/application/utils/interface.go | 4 ++-- cmd/juju/application/utils/mocks/charmresource_mock.go | 4 ++-- cmd/juju/application/utils/origin.go | 2 +- cmd/juju/application/utils/utils.go | 4 ++-- cmd/juju/application/utils/utils_test.go | 4 ++-- cmd/juju/charmhub/convert.go | 2 +- cmd/juju/charmhub/data.go | 2 +- cmd/juju/charmhub/download.go | 2 +- cmd/juju/charmhub/info.go | 2 +- cmd/juju/charmhub/infowriter.go | 2 +- cmd/juju/charmhub/infowriter_test.go | 2 +- cmd/juju/commands/bootstrap.go | 2 +- cmd/juju/commands/helptool.go | 2 +- cmd/juju/crossmodel/find_test.go | 2 +- cmd/juju/crossmodel/list.go | 2 +- cmd/juju/crossmodel/list_test.go | 2 +- cmd/juju/crossmodel/remoteendpoints.go | 2 +- cmd/juju/crossmodel/show_test.go | 2 +- cmd/juju/metricsdebug/collectmetrics_test.go | 2 +- cmd/juju/payload/util_test.go | 2 +- cmd/juju/resource/charmresources.go | 4 ++-- cmd/juju/resource/charmresources_test.go | 4 ++-- cmd/juju/resource/deploy.go | 2 +- cmd/juju/resource/deploy_test.go | 4 ++-- cmd/juju/resource/formatter.go | 2 +- cmd/juju/resource/formatter_test.go | 2 +- cmd/juju/resource/list_test.go | 2 +- cmd/juju/resource/output_tabular_test.go | 2 +- cmd/juju/resource/resource.go | 2 +- cmd/juju/resource/stub_test.go | 2 +- cmd/juju/resource/upload.go | 2 +- cmd/juju/resource/upload_test.go | 2 +- cmd/juju/resource/util_test.go | 2 +- cmd/juju/ssh/debughooks.go | 4 ++-- cmd/juju/ssh/ssh_container.go | 2 +- cmd/juju/ssh/ssh_container_test.go | 2 +- cmd/juju/status/formatter.go | 2 +- cmd/juju/status/output_tabular.go | 4 ++-- cmd/juju/status/status_internal_test.go | 2 +- cmd/jujud/agent/bootstrap_test.go | 2 +- cmd/jujud/agent/controllercharm.go | 2 +- container/broker/lxd-broker_test.go | 2 +- core/actions/actions.go | 2 +- core/assumes/featureset.go | 2 +- core/assumes/sat_checker.go | 2 +- core/assumes/sat_checker_test.go | 2 +- core/bundle/changes/changes.go | 2 +- core/bundle/changes/changes_test.go | 2 +- core/bundle/changes/diff.go | 2 +- core/bundle/changes/diff_test.go | 2 +- core/bundle/changes/handlers.go | 2 +- core/bundle/changes/handlers_test.go | 2 +- core/bundle/changes/model.go | 2 +- core/bundle/changes/model_test.go | 2 +- core/cache/unit.go | 2 +- core/cache/unit_test.go | 2 +- core/charm/channel.go | 2 +- core/charm/channel_test.go | 2 +- core/charm/charm_mock_test.go | 4 ++-- core/charm/charmpath.go | 2 +- core/charm/charmpath_test.go | 2 +- core/charm/computedseries.go | 2 +- core/charm/computedseries_test.go | 4 ++-- core/charm/downloader/downloader.go | 2 +- core/charm/downloader/downloader_test.go | 2 +- core/charm/downloader/export_test.go | 2 +- core/charm/downloader/mocks/downloader_mocks.go | 2 +- core/charm/format.go | 2 +- core/charm/format_test.go | 2 +- core/charm/kubernetes.go | 2 +- core/charm/kubernetes_test.go | 4 ++-- core/charm/origin.go | 2 +- core/charm/package_test.go | 2 +- core/charm/repository.go | 4 ++-- core/charm/repository/charmhub.go | 4 ++-- core/charm/repository/charmhub_test.go | 2 +- core/charm/repository/mocks/charmhub_client_mock.go | 2 +- core/crossmodel/interface.go | 2 +- core/crossmodel/params.go | 2 +- core/model/charm_mock_test.go | 4 ++-- core/model/package_test.go | 2 +- core/payloads/filter_test.go | 2 +- core/payloads/payload.go | 2 +- core/payloads/payload_test.go | 2 +- core/resources/application.go | 2 +- core/resources/application_test.go | 2 +- core/resources/content.go | 2 +- core/resources/resource.go | 2 +- core/resources/resource_test.go | 2 +- core/resources/serialization.go | 2 +- core/resources/serialization_test.go | 2 +- core/resources/testing/resource.go | 2 +- core/resources/util_test.go | 2 +- core/settings/settings.go | 2 +- environs/bootstrap/bootstrap.go | 2 +- environs/bootstrap/bootstrap_test.go | 2 +- environs/jujutest/livetests.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- juju/testing/conn.go | 2 +- juju/testing/repo.go | 2 +- migration/migration.go | 2 +- migration/migration_test.go | 2 +- resource/charmhub.go | 2 +- resource/charmhub_test.go | 4 ++-- resource/export_test.go | 2 +- resource/interfaces.go | 2 +- resource/mocks/cache_mock.go | 2 +- resource/opener.go | 4 ++-- resource/opener_test.go | 4 ++-- resource/resource.go | 2 +- resource/retryclient.go | 2 +- rpc/params/charms.go | 4 ++-- rpc/params/crossmodel.go | 2 +- rpc/params/multiwatcher.go | 2 +- rpc/params/params_test.go | 2 +- state/action_test.go | 2 +- state/allwatcher.go | 2 +- state/allwatcher_internal_test.go | 2 +- state/application.go | 2 +- state/application_test.go | 2 +- state/applicationoffers.go | 2 +- state/applicationoffers_test.go | 2 +- state/applicationofferuser_test.go | 2 +- state/bench_test.go | 2 +- state/charm.go | 2 +- state/charm_test.go | 2 +- state/cleanup.go | 2 +- state/cleanup_test.go | 2 +- state/devices.go | 2 +- state/endpoint.go | 2 +- state/endpoint_bindings.go | 2 +- state/endpoint_bindings_test.go | 2 +- state/endpoint_test.go | 2 +- state/errors/common.go | 2 +- state/export_test.go | 2 +- state/filesystem.go | 2 +- state/filesystem_test.go | 2 +- state/machine.go | 2 +- state/metrics.go | 2 +- state/migration_export.go | 2 +- state/migration_export_test.go | 4 ++-- state/migration_import.go | 2 +- state/migration_import_test.go | 2 +- state/migration_internal_test.go | 2 +- state/migrations/remoteapplications.go | 2 +- state/mocks/resources_mock.go | 2 +- state/model_test.go | 2 +- state/modelgeneration.go | 2 +- state/modelgeneration_test.go | 2 +- state/payloads_ns.go | 2 +- state/payloads_test.go | 2 +- state/podspec_ops.go | 2 +- state/relation.go | 2 +- state/relation_internal_test.go | 2 +- state/relation_test.go | 2 +- state/relationunit.go | 2 +- state/relationunit_test.go | 2 +- state/remoteapplication.go | 2 +- state/remoteapplication_test.go | 2 +- state/resources.go | 2 +- state/resources_staged_test.go | 2 +- state/resources_test.go | 4 ++-- state/secrets_test.go | 2 +- state/state.go | 2 +- state/state_test.go | 2 +- state/storage.go | 2 +- state/storage_test.go | 2 +- state/unit.go | 2 +- state/unit_test.go | 2 +- state/watcher.go | 2 +- testcharms/charm.go | 2 +- testcharms/repo/repo.go | 2 +- testing/factory/factory.go | 4 ++-- testing/factory/factory_test.go | 2 +- upgrades/upgradevalidation/validation.go | 2 +- worker/caasapplicationprovisioner/ops.go | 2 +- worker/caasapplicationprovisioner/ops_test.go | 2 +- worker/caasfirewaller/application_worker.go | 2 +- worker/caasfirewaller/worker.go | 2 +- worker/caasfirewaller/worker_test.go | 2 +- worker/caasfirewallersidecar/worker.go | 2 +- worker/caasfirewallersidecar/worker_test.go | 2 +- worker/caasoperator/client.go | 2 +- worker/caasoperator/download.go | 2 +- worker/caasoperator/localstate.go | 2 +- worker/caasoperator/localstate_test.go | 2 +- worker/caasoperator/mock_test.go | 2 +- worker/caasoperator/remotestate/mock_test.go | 2 +- worker/caasoperator/remotestate/snapshot.go | 2 +- worker/caasoperator/remotestate/watcher_test.go | 2 +- worker/caasoperatorprovisioner/mock_test.go | 2 +- worker/caasoperatorprovisioner/worker.go | 2 +- worker/caasoperatorprovisioner/worker_test.go | 2 +- worker/caasunitprovisioner/application_worker.go | 2 +- worker/caasunitprovisioner/worker.go | 2 +- worker/caasunitprovisioner/worker_test.go | 2 +- worker/firewaller/firewaller.go | 2 +- worker/firewaller/firewaller_test.go | 2 +- worker/meterstatus/runner.go | 2 +- worker/metrics/collect/context_test.go | 2 +- worker/metrics/collect/handler_test.go | 2 +- worker/metrics/collect/manifold.go | 4 ++-- worker/metrics/collect/manifold_test.go | 2 +- worker/metrics/sender/sender_test.go | 2 +- worker/metrics/spool/manifold.go | 2 +- worker/metrics/spool/metrics.go | 2 +- worker/metrics/spool/metrics_test.go | 2 +- worker/migrationmaster/worker.go | 2 +- worker/uniter/charm/bundles.go | 2 +- worker/uniter/charm/bundles_test.go | 2 +- worker/uniter/charm/charm_test.go | 2 +- worker/uniter/charm/manifest_deployer.go | 2 +- worker/uniter/container/workload.go | 2 +- worker/uniter/hook/hook.go | 2 +- worker/uniter/hook/hook_test.go | 2 +- worker/uniter/leadership/resolver.go | 2 +- worker/uniter/leadership/resolver_test.go | 2 +- worker/uniter/op_callbacks.go | 4 ++-- worker/uniter/operation/deploy.go | 2 +- worker/uniter/operation/deploy_test.go | 2 +- worker/uniter/operation/executor_test.go | 2 +- worker/uniter/operation/factory_test.go | 2 +- worker/uniter/operation/failaction_test.go | 2 +- worker/uniter/operation/leader.go | 2 +- worker/uniter/operation/leader_test.go | 2 +- worker/uniter/operation/remoteinit_test.go | 2 +- worker/uniter/operation/runaction_test.go | 2 +- worker/uniter/operation/runhook.go | 2 +- worker/uniter/operation/runhook_test.go | 2 +- worker/uniter/operation/state_test.go | 2 +- worker/uniter/operation/util_test.go | 2 +- worker/uniter/reboot/resolver.go | 2 +- worker/uniter/relation/mock_test.go | 2 +- worker/uniter/relation/relationer.go | 2 +- worker/uniter/relation/relationer_test.go | 4 ++-- worker/uniter/relation/resolver.go | 2 +- worker/uniter/relation/resolver_test.go | 4 ++-- worker/uniter/relation/state.go | 2 +- worker/uniter/relation/state_test.go | 2 +- worker/uniter/relation/statetracker.go | 4 ++-- worker/uniter/relation/statetracker_test.go | 4 ++-- worker/uniter/remotestate/mock_test.go | 2 +- worker/uniter/remotestate/state.go | 2 +- worker/uniter/remotestate/watcher.go | 2 +- worker/uniter/resolver.go | 4 ++-- worker/uniter/resolver/locker_test.go | 2 +- worker/uniter/resolver/loop.go | 4 ++-- worker/uniter/resolver/loop_test.go | 2 +- worker/uniter/resolver/opfactory.go | 2 +- worker/uniter/resolver/opfactory_test.go | 2 +- worker/uniter/resolver_test.go | 2 +- worker/uniter/runner/context/context.go | 4 ++-- worker/uniter/runner/context/context_test.go | 2 +- worker/uniter/runner/context/contextfactory.go | 2 +- worker/uniter/runner/context/contextfactory_test.go | 2 +- worker/uniter/runner/context/export_test.go | 2 +- worker/uniter/runner/context/mocks/hookunit_mock.go | 2 +- worker/uniter/runner/context/payloads/context_test.go | 2 +- worker/uniter/runner/context/resources/base_test.go | 2 +- worker/uniter/runner/context/resources/content.go | 2 +- worker/uniter/runner/context/resources/content_test.go | 2 +- worker/uniter/runner/context/resources/context.go | 2 +- worker/uniter/runner/context/resources/resource.go | 2 +- worker/uniter/runner/context/util_test.go | 2 +- worker/uniter/runner/factory.go | 2 +- worker/uniter/runner/factory_test.go | 2 +- worker/uniter/runner/jujuc/action-set.go | 2 +- worker/uniter/runner/jujuc/add-metric.go | 2 +- worker/uniter/runner/jujuc/context.go | 2 +- worker/uniter/runner/jujuc/jujuctesting/suite.go | 2 +- worker/uniter/runner/jujuc/jujuctesting/unit.go | 2 +- worker/uniter/runner/jujuc/mocks/context_mock.go | 2 +- worker/uniter/runner/jujuc/payload-register.go | 2 +- worker/uniter/runner/jujuc/payload-register_test.go | 2 +- worker/uniter/runner/jujuc/restricted.go | 2 +- worker/uniter/runner/mocks/context_mock.go | 2 +- worker/uniter/runner/runner_test.go | 2 +- worker/uniter/secrets/resolver.go | 2 +- worker/uniter/secrets/resolver_test.go | 2 +- worker/uniter/secrets/secrets_test.go | 2 +- worker/uniter/secrets/state.go | 2 +- worker/uniter/storage/attachments.go | 2 +- worker/uniter/storage/attachments_test.go | 2 +- worker/uniter/storage/resolver.go | 2 +- worker/uniter/storage/state.go | 2 +- worker/uniter/storage/state_test.go | 2 +- worker/uniter/uniter.go | 2 +- worker/uniter/uniter_test.go | 4 ++-- worker/uniter/upgradeseries/resolver.go | 2 +- worker/uniter/upgradeseries/resolver_test.go | 2 +- worker/uniter/util_test.go | 2 +- worker/uniter/verifycharmprofile/verifycharmprofile.go | 2 +- 516 files changed, 584 insertions(+), 584 deletions(-) diff --git a/api/agent/caasoperator/client.go b/api/agent/caasoperator/client.go index 0c9b25aa9f0c..2093bb76a0dd 100644 --- a/api/agent/caasoperator/client.go +++ b/api/agent/caasoperator/client.go @@ -4,7 +4,7 @@ package caasoperator import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/version/v2" diff --git a/api/agent/uniter/charm.go b/api/agent/uniter/charm.go index d80a144c7753..3ff092d1d0ed 100644 --- a/api/agent/uniter/charm.go +++ b/api/agent/uniter/charm.go @@ -6,7 +6,7 @@ package uniter import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/juju/rpc/params" diff --git a/api/agent/uniter/charm_test.go b/api/agent/uniter/charm_test.go index e066e71d7cdd..df3a0032d414 100644 --- a/api/agent/uniter/charm_test.go +++ b/api/agent/uniter/charm_test.go @@ -4,7 +4,7 @@ package uniter_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/api/agent/uniter/endpoint.go b/api/agent/uniter/endpoint.go index 345352319ddd..92c030b8080a 100644 --- a/api/agent/uniter/endpoint.go +++ b/api/agent/uniter/endpoint.go @@ -4,7 +4,7 @@ package uniter import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" ) // Endpoint represents one endpoint of a relation. It is just a wrapper diff --git a/api/agent/uniter/relation.go b/api/agent/uniter/relation.go index 58973d112e85..e1587a40363e 100644 --- a/api/agent/uniter/relation.go +++ b/api/agent/uniter/relation.go @@ -4,7 +4,7 @@ package uniter import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/api/agent/uniter/relation_test.go b/api/agent/uniter/relation_test.go index cebf20474853..248fbcc88dcd 100644 --- a/api/agent/uniter/relation_test.go +++ b/api/agent/uniter/relation_test.go @@ -4,7 +4,7 @@ package uniter_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/api/agent/uniter/relationunit_test.go b/api/agent/uniter/relationunit_test.go index 7cdb17d495a8..6ad5bd2f50ef 100644 --- a/api/agent/uniter/relationunit_test.go +++ b/api/agent/uniter/relationunit_test.go @@ -4,7 +4,7 @@ package uniter_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/api/agent/uniter/unit.go b/api/agent/uniter/unit.go index 58a12926d362..06eac42701f0 100644 --- a/api/agent/uniter/unit.go +++ b/api/agent/uniter/unit.go @@ -6,7 +6,7 @@ package uniter import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/api/agent/uniter/unit_test.go b/api/agent/uniter/unit_test.go index 116d29c6171e..0e52b44c0866 100644 --- a/api/agent/uniter/unit_test.go +++ b/api/agent/uniter/unit_test.go @@ -6,7 +6,7 @@ package uniter_test import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/api/agent/uniter/uniter.go b/api/agent/uniter/uniter.go index b4df323c384b..0f816ace871a 100644 --- a/api/agent/uniter/uniter.go +++ b/api/agent/uniter/uniter.go @@ -6,7 +6,7 @@ package uniter import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/transform" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/api/client/application/client.go b/api/client/application/client.go index 090cd706b388..d95df3711e26 100644 --- a/api/client/application/client.go +++ b/api/client/application/client.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/api/client/application/client_test.go b/api/client/application/client_test.go index 33a2b53590e7..aecc87088e7b 100644 --- a/api/client/application/client_test.go +++ b/api/client/application/client_test.go @@ -7,7 +7,7 @@ import ( stderrors "errors" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/api/client/applicationoffers/client.go b/api/client/applicationoffers/client.go index a2ce11a9d499..f9ac1894f774 100644 --- a/api/client/applicationoffers/client.go +++ b/api/client/applicationoffers/client.go @@ -5,7 +5,7 @@ package applicationoffers import ( "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/api/client/applicationoffers/client_test.go b/api/client/applicationoffers/client_test.go index 0312dccc23b0..a85777bd252f 100644 --- a/api/client/applicationoffers/client_test.go +++ b/api/client/applicationoffers/client_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/api/client/charms/client.go b/api/client/charms/client.go index 0f05cfe5b720..4e9109d01d44 100644 --- a/api/client/charms/client.go +++ b/api/client/charms/client.go @@ -12,8 +12,8 @@ import ( "strconv" "strings" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/version/v2" diff --git a/api/client/charms/client_test.go b/api/client/charms/client_test.go index 75bd687b7023..a554d76b1307 100644 --- a/api/client/charms/client_test.go +++ b/api/client/charms/client_test.go @@ -11,8 +11,8 @@ import ( "os" "strings" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" jc "github.com/juju/testing/checkers" "github.com/juju/version/v2" diff --git a/api/client/charms/downloader.go b/api/client/charms/downloader.go index a642d0b5421e..f738ce9562e2 100644 --- a/api/client/charms/downloader.go +++ b/api/client/charms/downloader.go @@ -8,7 +8,7 @@ import ( "io" "net/url" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/juju/api/base" diff --git a/api/client/charms/downloader_test.go b/api/client/charms/downloader_test.go index 6958fc247ed2..cdf36e0e7eb2 100644 --- a/api/client/charms/downloader_test.go +++ b/api/client/charms/downloader_test.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" gc "gopkg.in/check.v1" diff --git a/api/client/client/client_macaroon_test.go b/api/client/client/client_macaroon_test.go index 77e41d270ffc..317373c8d218 100644 --- a/api/client/client/client_macaroon_test.go +++ b/api/client/client/client_macaroon_test.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/api/client/payloads/client_test.go b/api/client/payloads/client_test.go index b8b0935c1b64..b03cbe693402 100644 --- a/api/client/payloads/client_test.go +++ b/api/client/payloads/client_test.go @@ -4,7 +4,7 @@ package payloads_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/api/client/payloads/helpers.go b/api/client/payloads/helpers.go index f28b6e128a3a..28ec119a74da 100644 --- a/api/client/payloads/helpers.go +++ b/api/client/payloads/helpers.go @@ -4,7 +4,7 @@ package payloads import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/api/client/payloads/helpers_test.go b/api/client/payloads/helpers_test.go index fd8acc050ee3..1416fd2ac35b 100644 --- a/api/client/payloads/helpers_test.go +++ b/api/client/payloads/helpers_test.go @@ -4,7 +4,7 @@ package payloads import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/api/client/resources/client.go b/api/client/resources/client.go index f78cd2cfb1b0..30b7e8e44d28 100644 --- a/api/client/resources/client.go +++ b/api/client/resources/client.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/api/client/resources/client_upload_test.go b/api/client/resources/client_upload_test.go index 5b42ebda47a0..5ae417654315 100644 --- a/api/client/resources/client_upload_test.go +++ b/api/client/resources/client_upload_test.go @@ -11,8 +11,8 @@ import ( "reflect" "strings" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" jc "github.com/juju/testing/checkers" "github.com/juju/utils/v3" diff --git a/api/client/resources/helpers.go b/api/client/resources/helpers.go index 681d5652a5bb..9efc8b6764b2 100644 --- a/api/client/resources/helpers.go +++ b/api/client/resources/helpers.go @@ -4,7 +4,7 @@ package resources import ( - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/api/client/resources/helpers_test.go b/api/client/resources/helpers_test.go index fcea3ac37711..16eb69bf8350 100644 --- a/api/client/resources/helpers_test.go +++ b/api/client/resources/helpers_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/api/client/resources/upload.go b/api/client/resources/upload.go index b1c3760ce1cc..00c2d705f66a 100644 --- a/api/client/resources/upload.go +++ b/api/client/resources/upload.go @@ -9,7 +9,7 @@ import ( "mime" "net/http" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/api/common/charm/charmorigin.go b/api/common/charm/charmorigin.go index a6df373c7ce1..290074e9120b 100644 --- a/api/common/charm/charmorigin.go +++ b/api/common/charm/charmorigin.go @@ -4,7 +4,7 @@ package charm import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" corebase "github.com/juju/juju/core/base" diff --git a/api/common/charm/charmorigin_test.go b/api/common/charm/charmorigin_test.go index 1a8aa42803f9..c567cb13aa4a 100644 --- a/api/common/charm/charmorigin_test.go +++ b/api/common/charm/charmorigin_test.go @@ -4,7 +4,7 @@ package charm_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" gc "gopkg.in/check.v1" commoncharm "github.com/juju/juju/api/common/charm" diff --git a/api/common/charms/common.go b/api/common/charms/common.go index d0f726300b7a..a7f972f8df23 100644 --- a/api/common/charms/common.go +++ b/api/common/charms/common.go @@ -6,8 +6,8 @@ package charms import ( "fmt" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/version/v2" @@ -394,7 +394,7 @@ func convertCharmManifest(input *params.CharmManifest) (*charm.Manifest, error) } res := []charm.Base(nil) for _, v := range input.Bases { - str := fmt.Sprintf("%s/%s", v.Name, v.Channel) + str := fmt.Sprintf("%s@%s", v.Name, v.Channel) b, err := charm.ParseBase(str, v.Architectures...) if err != nil { return nil, errors.Trace(err) diff --git a/api/common/charms/common_test.go b/api/common/charms/common_test.go index d60818f04268..41b3ee46beb2 100644 --- a/api/common/charms/common_test.go +++ b/api/common/charms/common_test.go @@ -4,8 +4,8 @@ package charms_test import ( - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/resource" "github.com/juju/version/v2" "go.uber.org/mock/gomock" gc "gopkg.in/check.v1" diff --git a/api/controller/caasapplicationprovisioner/client.go b/api/controller/caasapplicationprovisioner/client.go index d361e05f7d04..e47a84da8081 100644 --- a/api/controller/caasapplicationprovisioner/client.go +++ b/api/controller/caasapplicationprovisioner/client.go @@ -6,7 +6,7 @@ package caasapplicationprovisioner import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/version/v2" diff --git a/api/controller/caasapplicationprovisioner/client_test.go b/api/controller/caasapplicationprovisioner/client_test.go index 49faceecb890..1adb5c35202b 100644 --- a/api/controller/caasapplicationprovisioner/client_test.go +++ b/api/controller/caasapplicationprovisioner/client_test.go @@ -4,7 +4,7 @@ package caasapplicationprovisioner_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/api/controller/migrationmaster/client.go b/api/controller/migrationmaster/client.go index e012ba32fd9c..8a85a659566c 100644 --- a/api/controller/migrationmaster/client.go +++ b/api/controller/migrationmaster/client.go @@ -11,7 +11,7 @@ import ( "net/http" "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/version/v2" diff --git a/api/controller/migrationmaster/client_test.go b/api/controller/migrationmaster/client_test.go index 9c5d38b5fba0..38493399b909 100644 --- a/api/controller/migrationmaster/client_test.go +++ b/api/controller/migrationmaster/client_test.go @@ -12,7 +12,7 @@ import ( "strings" "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" jujutesting "github.com/juju/testing" diff --git a/api/controller/migrationtarget/client.go b/api/controller/migrationtarget/client.go index 19faf2181ab9..108952716be8 100644 --- a/api/controller/migrationtarget/client.go +++ b/api/controller/migrationtarget/client.go @@ -11,7 +11,7 @@ import ( "strconv" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/version/v2" diff --git a/api/controller/migrationtarget/client_test.go b/api/controller/migrationtarget/client_test.go index 444b4ea4f238..f2b19df472d4 100644 --- a/api/controller/migrationtarget/client_test.go +++ b/api/controller/migrationtarget/client_test.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jujutesting "github.com/juju/testing" diff --git a/api/watcher/watcher_test.go b/api/watcher/watcher_test.go index ee12003d8d2a..87c44a644343 100644 --- a/api/watcher/watcher_test.go +++ b/api/watcher/watcher_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery" "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery/checkers" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" "github.com/juju/utils/v3" diff --git a/apiserver/charms.go b/apiserver/charms.go index 20392d55cee4..d7d3e3fcbc60 100644 --- a/apiserver/charms.go +++ b/apiserver/charms.go @@ -18,7 +18,7 @@ import ( "strconv" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" ziputil "github.com/juju/utils/v3/zip" diff --git a/apiserver/charms_test.go b/apiserver/charms_test.go index 8afb254e3b63..528f2c961cf4 100644 --- a/apiserver/charms_test.go +++ b/apiserver/charms_test.go @@ -16,7 +16,7 @@ import ( "os" "path/filepath" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" "github.com/juju/utils/v3" gc "gopkg.in/check.v1" diff --git a/apiserver/common/charms/appcharminfo_test.go b/apiserver/common/charms/appcharminfo_test.go index 06707d5cddb6..f5c4af8524d9 100644 --- a/apiserver/common/charms/appcharminfo_test.go +++ b/apiserver/common/charms/appcharminfo_test.go @@ -4,7 +4,7 @@ package charms_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "go.uber.org/mock/gomock" gc "gopkg.in/check.v1" diff --git a/apiserver/common/charms/charminfo_test.go b/apiserver/common/charms/charminfo_test.go index a865e5cbfdbd..a0da43bdc9f9 100644 --- a/apiserver/common/charms/charminfo_test.go +++ b/apiserver/common/charms/charminfo_test.go @@ -4,7 +4,7 @@ package charms_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "go.uber.org/mock/gomock" gc "gopkg.in/check.v1" diff --git a/apiserver/common/charms/common.go b/apiserver/common/charms/common.go index 41c30aa5b9fd..52ca726e152e 100644 --- a/apiserver/common/charms/common.go +++ b/apiserver/common/charms/common.go @@ -4,8 +4,8 @@ package charms import ( - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/common/charms/mocks/mocks.go b/apiserver/common/charms/mocks/mocks.go index 264155993c92..ddf840a9f273 100644 --- a/apiserver/common/charms/mocks/mocks.go +++ b/apiserver/common/charms/mocks/mocks.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" charms "github.com/juju/juju/apiserver/common/charms" state "github.com/juju/juju/state" names "github.com/juju/names/v4" diff --git a/apiserver/common/crossmodel/interface.go b/apiserver/common/crossmodel/interface.go index a738cbfa46df..515fdfd25d1b 100644 --- a/apiserver/common/crossmodel/interface.go +++ b/apiserver/common/crossmodel/interface.go @@ -6,7 +6,7 @@ package crossmodel import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "gopkg.in/macaroon.v2" diff --git a/apiserver/common/firewall/firewall.go b/apiserver/common/firewall/firewall.go index db8246d84429..22f5c28a8a16 100644 --- a/apiserver/common/firewall/firewall.go +++ b/apiserver/common/firewall/firewall.go @@ -4,7 +4,7 @@ package firewall import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/apiserver/common/firewall/firewall_test.go b/apiserver/common/firewall/firewall_test.go index fb4e6b1de712..8dc3f35947bc 100644 --- a/apiserver/common/firewall/firewall_test.go +++ b/apiserver/common/firewall/firewall_test.go @@ -4,7 +4,7 @@ package firewall_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/apiserver/common/unitstatus.go b/apiserver/common/unitstatus.go index d59d5ec8b81d..29ccb863afa1 100644 --- a/apiserver/common/unitstatus.go +++ b/apiserver/common/unitstatus.go @@ -6,7 +6,7 @@ package common import ( "fmt" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/juju/core/status" "github.com/juju/juju/state" diff --git a/apiserver/facades/agent/caasapplication/state.go b/apiserver/facades/agent/caasapplication/state.go index 09fc6f16c62a..952b9b960932 100644 --- a/apiserver/facades/agent/caasapplication/state.go +++ b/apiserver/facades/agent/caasapplication/state.go @@ -4,7 +4,7 @@ package caasapplication import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/version/v2" diff --git a/apiserver/facades/agent/caasoperator/mock_test.go b/apiserver/facades/agent/caasoperator/mock_test.go index 807db2d3211d..138fd2cfb621 100644 --- a/apiserver/facades/agent/caasoperator/mock_test.go +++ b/apiserver/facades/agent/caasoperator/mock_test.go @@ -4,7 +4,7 @@ package caasoperator_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/agent/caasoperator/operator.go b/apiserver/facades/agent/caasoperator/operator.go index addadcbadce4..3c4d837f786f 100644 --- a/apiserver/facades/agent/caasoperator/operator.go +++ b/apiserver/facades/agent/caasoperator/operator.go @@ -4,7 +4,7 @@ package caasoperator import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/agent/caasoperator/state.go b/apiserver/facades/agent/caasoperator/state.go index b5dd0a4cb648..46d0c4e6dade 100644 --- a/apiserver/facades/agent/caasoperator/state.go +++ b/apiserver/facades/agent/caasoperator/state.go @@ -4,7 +4,7 @@ package caasoperator import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/juju/core/leadership" diff --git a/apiserver/facades/agent/instancemutater/instancemutater.go b/apiserver/facades/agent/instancemutater/instancemutater.go index f31fccc3201d..90378666e978 100644 --- a/apiserver/facades/agent/instancemutater/instancemutater.go +++ b/apiserver/facades/agent/instancemutater/instancemutater.go @@ -4,7 +4,7 @@ package instancemutater import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/apiserver/facades/agent/instancemutater/instancemutater_test.go b/apiserver/facades/agent/instancemutater/instancemutater_test.go index 2289f205f1ae..35c4743e0f41 100644 --- a/apiserver/facades/agent/instancemutater/instancemutater_test.go +++ b/apiserver/facades/agent/instancemutater/instancemutater_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" coretesting "github.com/juju/testing" diff --git a/apiserver/facades/agent/instancemutater/interface.go b/apiserver/facades/agent/instancemutater/interface.go index 7776bb980033..64e038efa1c9 100644 --- a/apiserver/facades/agent/instancemutater/interface.go +++ b/apiserver/facades/agent/instancemutater/interface.go @@ -6,7 +6,7 @@ package instancemutater import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/juju/core/instance" "github.com/juju/juju/core/lxdprofile" diff --git a/apiserver/facades/agent/instancemutater/lxdprofilewatcher.go b/apiserver/facades/agent/instancemutater/lxdprofilewatcher.go index e7eeaaca70b4..ecedc5db13d3 100644 --- a/apiserver/facades/agent/instancemutater/lxdprofilewatcher.go +++ b/apiserver/facades/agent/instancemutater/lxdprofilewatcher.go @@ -6,7 +6,7 @@ package instancemutater import ( "sync" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/agent/instancemutater/lxdprofilewatcher_test.go b/apiserver/facades/agent/instancemutater/lxdprofilewatcher_test.go index 456d56788cf2..d1c325f3609f 100644 --- a/apiserver/facades/agent/instancemutater/lxdprofilewatcher_test.go +++ b/apiserver/facades/agent/instancemutater/lxdprofilewatcher_test.go @@ -4,7 +4,7 @@ package instancemutater_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/worker/v3" "github.com/juju/worker/v3/workertest" diff --git a/apiserver/facades/agent/instancemutater/mocks/instancemutater_mock.go b/apiserver/facades/agent/instancemutater/mocks/instancemutater_mock.go index 71ace1e087e0..b5272312dc22 100644 --- a/apiserver/facades/agent/instancemutater/mocks/instancemutater_mock.go +++ b/apiserver/facades/agent/instancemutater/mocks/instancemutater_mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" time "time" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" instancemutater "github.com/juju/juju/apiserver/facades/agent/instancemutater" instance "github.com/juju/juju/core/instance" lxdprofile "github.com/juju/juju/core/lxdprofile" diff --git a/apiserver/facades/agent/instancemutater/shim.go b/apiserver/facades/agent/instancemutater/shim.go index 4ca578ee2009..892649e50637 100644 --- a/apiserver/facades/agent/instancemutater/shim.go +++ b/apiserver/facades/agent/instancemutater/shim.go @@ -4,7 +4,7 @@ package instancemutater import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/juju/core/lxdprofile" diff --git a/apiserver/facades/agent/payloadshookcontext/unitfacade_test.go b/apiserver/facades/agent/payloadshookcontext/unitfacade_test.go index f4355daae134..0ec165fc73fe 100644 --- a/apiserver/facades/agent/payloadshookcontext/unitfacade_test.go +++ b/apiserver/facades/agent/payloadshookcontext/unitfacade_test.go @@ -4,7 +4,7 @@ package payloadshookcontext_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/apiserver/facades/agent/provisioner/interface.go b/apiserver/facades/agent/provisioner/interface.go index 33195236a27f..47bd9c551e24 100644 --- a/apiserver/facades/agent/provisioner/interface.go +++ b/apiserver/facades/agent/provisioner/interface.go @@ -4,7 +4,7 @@ package provisioner import ( - jujucharm "github.com/juju/charm/v10" + jujucharm "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/juju/core/instance" diff --git a/apiserver/facades/agent/provisioner/mocks/package_mock.go b/apiserver/facades/agent/provisioner/mocks/package_mock.go index 6a28dcacac5e..6c46c36ccf34 100644 --- a/apiserver/facades/agent/provisioner/mocks/package_mock.go +++ b/apiserver/facades/agent/provisioner/mocks/package_mock.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" set "github.com/juju/collections/set" provisioner "github.com/juju/juju/apiserver/facades/agent/provisioner" constraints "github.com/juju/juju/core/constraints" diff --git a/apiserver/facades/agent/provisioner/provisioner_test.go b/apiserver/facades/agent/provisioner/provisioner_test.go index 4dc691ceb0f8..3c4902da0bea 100644 --- a/apiserver/facades/agent/provisioner/provisioner_test.go +++ b/apiserver/facades/agent/provisioner/provisioner_test.go @@ -8,7 +8,7 @@ import ( stdtesting "testing" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/proxy" diff --git a/apiserver/facades/agent/provisioner/shim.go b/apiserver/facades/agent/provisioner/shim.go index 5604bb19f501..bdf1caf7ee6c 100644 --- a/apiserver/facades/agent/provisioner/shim.go +++ b/apiserver/facades/agent/provisioner/shim.go @@ -4,7 +4,7 @@ package provisioner import ( - jujucharm "github.com/juju/charm/v10" + jujucharm "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/juju/network/containerizer" diff --git a/apiserver/facades/agent/uniter/goal-state_test.go b/apiserver/facades/agent/uniter/goal-state_test.go index f6931f4cc099..053553384688 100644 --- a/apiserver/facades/agent/uniter/goal-state_test.go +++ b/apiserver/facades/agent/uniter/goal-state_test.go @@ -6,7 +6,7 @@ package uniter_test import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/apiserver/facades/agent/uniter/mocks/newlxdprofile.go b/apiserver/facades/agent/uniter/mocks/newlxdprofile.go index 46582d0b771a..b569f04d5950 100644 --- a/apiserver/facades/agent/uniter/mocks/newlxdprofile.go +++ b/apiserver/facades/agent/uniter/mocks/newlxdprofile.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" uniter "github.com/juju/juju/apiserver/facades/agent/uniter" instance "github.com/juju/juju/core/instance" lxdprofile "github.com/juju/juju/core/lxdprofile" diff --git a/apiserver/facades/agent/uniter/networkinfo_test.go b/apiserver/facades/agent/uniter/networkinfo_test.go index dda1b9749615..255d5e4fcab8 100644 --- a/apiserver/facades/agent/uniter/networkinfo_test.go +++ b/apiserver/facades/agent/uniter/networkinfo_test.go @@ -9,7 +9,7 @@ import ( "math/rand" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/names/v4" "github.com/juju/retry" diff --git a/apiserver/facades/agent/uniter/newlxdprofile.go b/apiserver/facades/agent/uniter/newlxdprofile.go index 7a95c8cf5517..e8cb9f1446bf 100644 --- a/apiserver/facades/agent/uniter/newlxdprofile.go +++ b/apiserver/facades/agent/uniter/newlxdprofile.go @@ -4,7 +4,7 @@ package uniter import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/apiserver/facades/agent/uniter/newlxdprofile_test.go b/apiserver/facades/agent/uniter/newlxdprofile_test.go index 9ce394803608..83631f283300 100644 --- a/apiserver/facades/agent/uniter/newlxdprofile_test.go +++ b/apiserver/facades/agent/uniter/newlxdprofile_test.go @@ -4,7 +4,7 @@ package uniter_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/apiserver/facades/agent/uniter/subordinaterelationwatcher.go b/apiserver/facades/agent/uniter/subordinaterelationwatcher.go index 42e6334cb8fc..95509bf540ad 100644 --- a/apiserver/facades/agent/uniter/subordinaterelationwatcher.go +++ b/apiserver/facades/agent/uniter/subordinaterelationwatcher.go @@ -4,7 +4,7 @@ package uniter import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/worker/v3/catacomb" diff --git a/apiserver/facades/agent/uniter/uniter.go b/apiserver/facades/agent/uniter/uniter.go index e08be48dbcb4..bcaf7796c3a0 100644 --- a/apiserver/facades/agent/uniter/uniter.go +++ b/apiserver/facades/agent/uniter/uniter.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/collections/transform" "github.com/juju/errors" diff --git a/apiserver/facades/agent/uniter/uniter_test.go b/apiserver/facades/agent/uniter/uniter_test.go index 6d60ee212362..8d600a46a51d 100644 --- a/apiserver/facades/agent/uniter/uniter_test.go +++ b/apiserver/facades/agent/uniter/uniter_test.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/mgo/v3/bson" diff --git a/apiserver/facades/client/application/application.go b/apiserver/facades/client/application/application.go index cc3a4023cfe0..cab19a6d1821 100644 --- a/apiserver/facades/client/application/application.go +++ b/apiserver/facades/client/application/application.go @@ -10,7 +10,7 @@ import ( "reflect" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/transform" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/apiserver/facades/client/application/application_test.go b/apiserver/facades/client/application/application_test.go index f2c7141e103a..5ab97cf1aad2 100644 --- a/apiserver/facades/client/application/application_test.go +++ b/apiserver/facades/client/application/application_test.go @@ -8,7 +8,7 @@ import ( "regexp" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/client/application/application_unit_test.go b/apiserver/facades/client/application/application_unit_test.go index bd2deaa2c27f..d7058cd8737f 100644 --- a/apiserver/facades/client/application/application_unit_test.go +++ b/apiserver/facades/client/application/application_unit_test.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/assumes" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/assumes" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/schema" diff --git a/apiserver/facades/client/application/backend.go b/apiserver/facades/client/application/backend.go index 0e3856ed5ea4..270e52b520b4 100644 --- a/apiserver/facades/client/application/backend.go +++ b/apiserver/facades/client/application/backend.go @@ -6,7 +6,7 @@ package application import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/schema" diff --git a/apiserver/facades/client/application/deploy.go b/apiserver/facades/client/application/deploy.go index c60dc80c3a1f..b6c26e01261e 100644 --- a/apiserver/facades/client/application/deploy.go +++ b/apiserver/facades/client/application/deploy.go @@ -6,8 +6,8 @@ package application import ( "fmt" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/assumes" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/assumes" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/client/application/deploy_test.go b/apiserver/facades/client/application/deploy_test.go index defda01a3c9c..8c0c07842e90 100644 --- a/apiserver/facades/client/application/deploy_test.go +++ b/apiserver/facades/client/application/deploy_test.go @@ -6,7 +6,7 @@ package application_test import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/client/application/get.go b/apiserver/facades/client/application/get.go index c7407bd2c113..99eb68d27aab 100644 --- a/apiserver/facades/client/application/get.go +++ b/apiserver/facades/client/application/get.go @@ -4,7 +4,7 @@ package application import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/schema" "gopkg.in/juju/environschema.v1" diff --git a/apiserver/facades/client/application/get_test.go b/apiserver/facades/client/application/get_test.go index 88f0dbed2034..aa2cfe0ec2c9 100644 --- a/apiserver/facades/client/application/get_test.go +++ b/apiserver/facades/client/application/get_test.go @@ -6,7 +6,7 @@ package application_test import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" "gopkg.in/juju/environschema.v1" diff --git a/apiserver/facades/client/application/mocks/application_mock.go b/apiserver/facades/client/application/mocks/application_mock.go index 672a9667a2ba..6592fdab2ce3 100644 --- a/apiserver/facades/client/application/mocks/application_mock.go +++ b/apiserver/facades/client/application/mocks/application_mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" time "time" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" storagecommon "github.com/juju/juju/apiserver/common/storagecommon" application "github.com/juju/juju/apiserver/facades/client/application" cloud "github.com/juju/juju/cloud" diff --git a/apiserver/facades/client/application/mocks/lxdprofile_mock.go b/apiserver/facades/client/application/mocks/lxdprofile_mock.go index ef0d4c9cf80d..fca8aa6db7ed 100644 --- a/apiserver/facades/client/application/mocks/lxdprofile_mock.go +++ b/apiserver/facades/client/application/mocks/lxdprofile_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/juju/charm/v10 (interfaces: LXDProfiler) +// Source: github.com/juju/charm/v11 (interfaces: LXDProfiler) // Package mocks is a generated GoMock package. package mocks @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" gomock "go.uber.org/mock/gomock" ) diff --git a/apiserver/facades/client/application/package_test.go b/apiserver/facades/client/application/package_test.go index 1ca0dfc166ca..f4c70285e8e8 100644 --- a/apiserver/facades/client/application/package_test.go +++ b/apiserver/facades/client/application/package_test.go @@ -13,7 +13,7 @@ func TestAll(t *stdtesting.T) { testing.MgoTestPackage(t) } -//go:generate go run go.uber.org/mock/mockgen -package mocks -destination mocks/lxdprofile_mock.go github.com/juju/charm/v10 LXDProfiler +//go:generate go run go.uber.org/mock/mockgen -package mocks -destination mocks/lxdprofile_mock.go github.com/juju/charm/v11 LXDProfiler //go:generate go run go.uber.org/mock/mockgen -package mocks -destination mocks/state_mock.go github.com/juju/juju/state StorageAttachment,StorageInstance,MachinePortRanges,UnitPortRanges,CloudContainer //go:generate go run go.uber.org/mock/mockgen -package mocks -destination mocks/state_storage_mock.go github.com/juju/juju/state/storage Storage //go:generate go run go.uber.org/mock/mockgen -package mocks -destination mocks/storage_mock.go github.com/juju/juju/storage ProviderRegistry diff --git a/apiserver/facades/client/application/updateseries_mocks_test.go b/apiserver/facades/client/application/updateseries_mocks_test.go index 5f8112d1bafc..d4a1288930cc 100644 --- a/apiserver/facades/client/application/updateseries_mocks_test.go +++ b/apiserver/facades/client/application/updateseries_mocks_test.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" charmhub "github.com/juju/juju/charmhub" transport "github.com/juju/juju/charmhub/transport" base "github.com/juju/juju/core/base" diff --git a/apiserver/facades/client/application/updateseries_test.go b/apiserver/facades/client/application/updateseries_test.go index 88012fb5eeba..1d5f71dec1f6 100644 --- a/apiserver/facades/client/application/updateseries_test.go +++ b/apiserver/facades/client/application/updateseries_test.go @@ -4,7 +4,7 @@ package application import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/client/applicationoffers/applicationoffers_test.go b/apiserver/facades/client/applicationoffers/applicationoffers_test.go index 179bf3bba01f..3c1d481d7864 100644 --- a/apiserver/facades/client/applicationoffers/applicationoffers_test.go +++ b/apiserver/facades/client/applicationoffers/applicationoffers_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery" "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery/checkers" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/client/applicationoffers/base.go b/apiserver/facades/client/applicationoffers/base.go index 643945fc91a6..e4d67bd74ed4 100644 --- a/apiserver/facades/client/applicationoffers/base.go +++ b/apiserver/facades/client/applicationoffers/base.go @@ -8,7 +8,7 @@ import ( "fmt" "sort" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/client/applicationoffers/base_test.go b/apiserver/facades/client/applicationoffers/base_test.go index 29f51ebef2c7..dd9f9d82c0b6 100644 --- a/apiserver/facades/client/applicationoffers/base_test.go +++ b/apiserver/facades/client/applicationoffers/base_test.go @@ -4,7 +4,7 @@ package applicationoffers_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" jtesting "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/client/applicationoffers/mock_test.go b/apiserver/facades/client/applicationoffers/mock_test.go index e72a6f3eefda..d3bdd00f8b84 100644 --- a/apiserver/facades/client/applicationoffers/mock_test.go +++ b/apiserver/facades/client/applicationoffers/mock_test.go @@ -11,7 +11,7 @@ import ( "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery" "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery/checkers" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jtesting "github.com/juju/testing" diff --git a/apiserver/facades/client/applicationoffers/state.go b/apiserver/facades/client/applicationoffers/state.go index d15e70675d40..6233b4734b08 100644 --- a/apiserver/facades/client/applicationoffers/state.go +++ b/apiserver/facades/client/applicationoffers/state.go @@ -4,7 +4,7 @@ package applicationoffers import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/client/bundle/bundle.go b/apiserver/facades/client/bundle/bundle.go index 8a7cbf6fad10..6fbf71cee59e 100644 --- a/apiserver/facades/client/bundle/bundle.go +++ b/apiserver/facades/client/bundle/bundle.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/resource" "github.com/juju/collections/set" "github.com/juju/description/v4" "github.com/juju/errors" diff --git a/apiserver/facades/client/bundle/bundle_test.go b/apiserver/facades/client/bundle/bundle_test.go index 09320b9e3d5d..2fbd7b8dae04 100644 --- a/apiserver/facades/client/bundle/bundle_test.go +++ b/apiserver/facades/client/bundle/bundle_test.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/resource" "github.com/juju/description/v4" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/client/bundle/mock_test.go b/apiserver/facades/client/bundle/mock_test.go index 98e8e8b8afea..9212dfb5a587 100644 --- a/apiserver/facades/client/bundle/mock_test.go +++ b/apiserver/facades/client/bundle/mock_test.go @@ -4,7 +4,7 @@ package bundle_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/description/v4" "github.com/juju/testing" diff --git a/apiserver/facades/client/bundle/state.go b/apiserver/facades/client/bundle/state.go index 9dc0111e22d7..b99466e92072 100644 --- a/apiserver/facades/client/bundle/state.go +++ b/apiserver/facades/client/bundle/state.go @@ -4,7 +4,7 @@ package bundle import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/description/v4" "github.com/juju/juju/state" diff --git a/apiserver/facades/client/charms/client.go b/apiserver/facades/client/charms/client.go index 3ddeb649e418..66c23bb5aba7 100644 --- a/apiserver/facades/client/charms/client.go +++ b/apiserver/facades/client/charms/client.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/apiserver/facades/client/charms/client_test.go b/apiserver/facades/client/charms/client_test.go index 2d3a21f363f3..56d0ee5d2f2d 100644 --- a/apiserver/facades/client/charms/client_test.go +++ b/apiserver/facades/client/charms/client_test.go @@ -6,7 +6,7 @@ package charms_test import ( "net/url" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/client/charms/clientnormalize_test.go b/apiserver/facades/client/charms/clientnormalize_test.go index 0f2402d4c55e..672fc4f7aad4 100644 --- a/apiserver/facades/client/charms/clientnormalize_test.go +++ b/apiserver/facades/client/charms/clientnormalize_test.go @@ -4,7 +4,7 @@ package charms import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/apiserver/facades/client/charms/conversions.go b/apiserver/facades/client/charms/conversions.go index dde88c5ffde7..7ca583795262 100644 --- a/apiserver/facades/client/charms/conversions.go +++ b/apiserver/facades/client/charms/conversions.go @@ -4,7 +4,7 @@ package charms import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" corebase "github.com/juju/juju/core/base" diff --git a/apiserver/facades/client/charms/interface.go b/apiserver/facades/client/charms/interface.go index 7d3594d91171..4ecf65fdcf44 100644 --- a/apiserver/facades/client/charms/interface.go +++ b/apiserver/facades/client/charms/interface.go @@ -4,7 +4,7 @@ package charms import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/juju/apiserver/facades/client/charms/interfaces" diff --git a/apiserver/facades/client/charms/interfaces/downloader.go b/apiserver/facades/client/charms/interfaces/downloader.go index bde7f0d7c105..200d422900e6 100644 --- a/apiserver/facades/client/charms/interfaces/downloader.go +++ b/apiserver/facades/client/charms/interfaces/downloader.go @@ -4,7 +4,7 @@ package interfaces import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" corecharm "github.com/juju/juju/core/charm" ) diff --git a/apiserver/facades/client/charms/interfaces/state.go b/apiserver/facades/client/charms/interfaces/state.go index 48ac5e2c90f1..3123ab18d31c 100644 --- a/apiserver/facades/client/charms/interfaces/state.go +++ b/apiserver/facades/client/charms/interfaces/state.go @@ -4,7 +4,7 @@ package interfaces import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/juju/apiserver/facades/client/charms/services" diff --git a/apiserver/facades/client/charms/mocks/repository.go b/apiserver/facades/client/charms/mocks/repository.go index b991f056fcb0..8b36246a1590 100644 --- a/apiserver/facades/client/charms/mocks/repository.go +++ b/apiserver/facades/client/charms/mocks/repository.go @@ -8,8 +8,8 @@ import ( url "net/url" reflect "reflect" - charm "github.com/juju/charm/v10" - resource "github.com/juju/charm/v10/resource" + charm "github.com/juju/charm/v11" + resource "github.com/juju/charm/v11/resource" charm0 "github.com/juju/juju/core/charm" gomock "go.uber.org/mock/gomock" ) diff --git a/apiserver/facades/client/charms/mocks/state_mock.go b/apiserver/facades/client/charms/mocks/state_mock.go index 6b3fab139e7f..d2368f6a9cb9 100644 --- a/apiserver/facades/client/charms/mocks/state_mock.go +++ b/apiserver/facades/client/charms/mocks/state_mock.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" interfaces "github.com/juju/juju/apiserver/facades/client/charms/interfaces" services "github.com/juju/juju/apiserver/facades/client/charms/services" cloud "github.com/juju/juju/cloud" diff --git a/apiserver/facades/client/charms/services/interfaces.go b/apiserver/facades/client/charms/services/interfaces.go index 65038a40ec54..acdceed138be 100644 --- a/apiserver/facades/client/charms/services/interfaces.go +++ b/apiserver/facades/client/charms/services/interfaces.go @@ -6,7 +6,7 @@ package services import ( "io" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/juju/environs/config" "github.com/juju/juju/state" diff --git a/apiserver/facades/client/charms/services/mocks/interface_mocks.go b/apiserver/facades/client/charms/services/mocks/interface_mocks.go index af41a88a6447..393396de1dc7 100644 --- a/apiserver/facades/client/charms/services/mocks/interface_mocks.go +++ b/apiserver/facades/client/charms/services/mocks/interface_mocks.go @@ -8,7 +8,7 @@ import ( io "io" reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" services "github.com/juju/juju/apiserver/facades/client/charms/services" config "github.com/juju/juju/environs/config" state "github.com/juju/juju/state" diff --git a/apiserver/facades/client/charms/services/storage.go b/apiserver/facades/client/charms/services/storage.go index 90f1a4dada67..3570207ba0a0 100644 --- a/apiserver/facades/client/charms/services/storage.go +++ b/apiserver/facades/client/charms/services/storage.go @@ -6,7 +6,7 @@ package services import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/utils/v3" diff --git a/apiserver/facades/client/charms/services/storage_test.go b/apiserver/facades/client/charms/services/storage_test.go index f11043137784..8133f3eb46ba 100644 --- a/apiserver/facades/client/charms/services/storage_test.go +++ b/apiserver/facades/client/charms/services/storage_test.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/loggo" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/client/client/api_test.go b/apiserver/facades/client/client/api_test.go index 04b2271f0a68..569580bbff6d 100644 --- a/apiserver/facades/client/client/api_test.go +++ b/apiserver/facades/client/client/api_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/apiserver/facades/client/client/backend.go b/apiserver/facades/client/client/backend.go index 3511311674fa..639204fbe3ab 100644 --- a/apiserver/facades/client/client/backend.go +++ b/apiserver/facades/client/client/backend.go @@ -6,7 +6,7 @@ package client import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/mgo/v3" "github.com/juju/names/v4" diff --git a/apiserver/facades/client/client/client_test.go b/apiserver/facades/client/client/client_test.go index 3a825a904a1b..e7b547fdec40 100644 --- a/apiserver/facades/client/client/client_test.go +++ b/apiserver/facades/client/client/client_test.go @@ -6,7 +6,7 @@ package client_test import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" jtesting "github.com/juju/testing" diff --git a/apiserver/facades/client/client/mocks/client_mock.go b/apiserver/facades/client/client/mocks/client_mock.go index db12a05c7a0c..a2e663742a08 100644 --- a/apiserver/facades/client/client/mocks/client_mock.go +++ b/apiserver/facades/client/client/mocks/client_mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" time "time" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" client "github.com/juju/juju/apiserver/facades/client/client" controller "github.com/juju/juju/controller" constraints "github.com/juju/juju/core/constraints" diff --git a/apiserver/facades/client/client/perm_test.go b/apiserver/facades/client/client/perm_test.go index c97f946e2583..b6df7656d44b 100644 --- a/apiserver/facades/client/client/perm_test.go +++ b/apiserver/facades/client/client/perm_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/client/client/status.go b/apiserver/facades/client/client/status.go index ce858286b09e..8a93b2d10453 100644 --- a/apiserver/facades/client/client/status.go +++ b/apiserver/facades/client/client/status.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/client/client/testing/suite.go b/apiserver/facades/client/client/testing/suite.go index d9328f4e9c48..964874e12f81 100644 --- a/apiserver/facades/client/client/testing/suite.go +++ b/apiserver/facades/client/client/testing/suite.go @@ -11,7 +11,7 @@ package testing import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/apiserver/facades/client/controller/backend.go b/apiserver/facades/client/controller/backend.go index b4ba87678e37..dfae366cc20f 100644 --- a/apiserver/facades/client/controller/backend.go +++ b/apiserver/facades/client/controller/backend.go @@ -4,7 +4,7 @@ package controller import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" jujucontroller "github.com/juju/juju/controller" diff --git a/apiserver/facades/client/controller/mocks/state_mock.go b/apiserver/facades/client/controller/mocks/state_mock.go index 626c6eaa1947..b1ff01b0a937 100644 --- a/apiserver/facades/client/controller/mocks/state_mock.go +++ b/apiserver/facades/client/controller/mocks/state_mock.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" controller "github.com/juju/juju/apiserver/facades/client/controller" controller0 "github.com/juju/juju/controller" permission "github.com/juju/juju/core/permission" diff --git a/apiserver/facades/client/machinemanager/machinemanager_test.go b/apiserver/facades/client/machinemanager/machinemanager_test.go index 53e9d7edbfc7..8ec3f1aaf54b 100644 --- a/apiserver/facades/client/machinemanager/machinemanager_test.go +++ b/apiserver/facades/client/machinemanager/machinemanager_test.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/apiserver/facades/client/machinemanager/mocks/types_mock.go b/apiserver/facades/client/machinemanager/mocks/types_mock.go index 1392fcb9adc0..d0d99de6919e 100644 --- a/apiserver/facades/client/machinemanager/mocks/types_mock.go +++ b/apiserver/facades/client/machinemanager/mocks/types_mock.go @@ -9,7 +9,7 @@ import ( reflect "reflect" time "time" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" storagecommon "github.com/juju/juju/apiserver/common/storagecommon" machinemanager "github.com/juju/juju/apiserver/facades/client/machinemanager" charmhub "github.com/juju/juju/charmhub" diff --git a/apiserver/facades/client/machinemanager/state.go b/apiserver/facades/client/machinemanager/state.go index 4c1e455f77f2..91b792a59855 100644 --- a/apiserver/facades/client/machinemanager/state.go +++ b/apiserver/facades/client/machinemanager/state.go @@ -6,7 +6,7 @@ package machinemanager import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/client/machinemanager/upgradeseries_test.go b/apiserver/facades/client/machinemanager/upgradeseries_test.go index c4d41806cbd3..e1102ea09919 100644 --- a/apiserver/facades/client/machinemanager/upgradeseries_test.go +++ b/apiserver/facades/client/machinemanager/upgradeseries_test.go @@ -4,7 +4,7 @@ package machinemanager_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/apiserver/facades/client/metricsdebug/metricsdebug.go b/apiserver/facades/client/metricsdebug/metricsdebug.go index ea460d2e93ea..2908d8c751c3 100644 --- a/apiserver/facades/client/metricsdebug/metricsdebug.go +++ b/apiserver/facades/client/metricsdebug/metricsdebug.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/client/modelgeneration/interface.go b/apiserver/facades/client/modelgeneration/interface.go index 36127b3cd5d2..52947c654c61 100644 --- a/apiserver/facades/client/modelgeneration/interface.go +++ b/apiserver/facades/client/modelgeneration/interface.go @@ -4,7 +4,7 @@ package modelgeneration import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/juju/core/cache" diff --git a/apiserver/facades/client/modelgeneration/mocks/package_mock.go b/apiserver/facades/client/modelgeneration/mocks/package_mock.go index d74997344d34..f4425bc976ae 100644 --- a/apiserver/facades/client/modelgeneration/mocks/package_mock.go +++ b/apiserver/facades/client/modelgeneration/mocks/package_mock.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" modelgeneration "github.com/juju/juju/apiserver/facades/client/modelgeneration" cache "github.com/juju/juju/core/cache" settings "github.com/juju/juju/core/settings" diff --git a/apiserver/facades/client/modelgeneration/shim.go b/apiserver/facades/client/modelgeneration/shim.go index 6c5d94fc8e1d..47076110c0f6 100644 --- a/apiserver/facades/client/modelgeneration/shim.go +++ b/apiserver/facades/client/modelgeneration/shim.go @@ -4,7 +4,7 @@ package modelgeneration import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/juju/core/cache" diff --git a/apiserver/facades/client/payloads/facade_test.go b/apiserver/facades/client/payloads/facade_test.go index 5dfa9bc7b9a0..1829b6faf9c7 100644 --- a/apiserver/facades/client/payloads/facade_test.go +++ b/apiserver/facades/client/payloads/facade_test.go @@ -4,7 +4,7 @@ package payloads_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/apiserver/facades/client/resources/base_test.go b/apiserver/facades/client/resources/base_test.go index 365f32d3b34c..c5035bd33b10 100644 --- a/apiserver/facades/client/resources/base_test.go +++ b/apiserver/facades/client/resources/base_test.go @@ -6,7 +6,7 @@ package resources_test import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/testing" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/apiserver/facades/client/resources/facade.go b/apiserver/facades/client/resources/facade.go index b080d73ecfe7..ff6d757b0d92 100644 --- a/apiserver/facades/client/resources/facade.go +++ b/apiserver/facades/client/resources/facade.go @@ -4,8 +4,8 @@ package resources import ( - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/apiserver/facades/client/resources/mocks/backend.go b/apiserver/facades/client/resources/mocks/backend.go index 65da5d8e5ed0..f3c30ca278d0 100644 --- a/apiserver/facades/client/resources/mocks/backend.go +++ b/apiserver/facades/client/resources/mocks/backend.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - resource "github.com/juju/charm/v10/resource" + resource "github.com/juju/charm/v11/resource" resources "github.com/juju/juju/apiserver/facades/client/resources" resources0 "github.com/juju/juju/core/resources" gomock "go.uber.org/mock/gomock" diff --git a/apiserver/facades/client/resources/package_test.go b/apiserver/facades/client/resources/package_test.go index 298a36b702bd..a1bc8ecec371 100644 --- a/apiserver/facades/client/resources/package_test.go +++ b/apiserver/facades/client/resources/package_test.go @@ -6,8 +6,8 @@ package resources import ( "testing" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" gc "gopkg.in/check.v1" corecharm "github.com/juju/juju/core/charm" diff --git a/apiserver/facades/client/resources/repository.go b/apiserver/facades/client/resources/repository.go index a8f5918cff7e..f786a154adc7 100644 --- a/apiserver/facades/client/resources/repository.go +++ b/apiserver/facades/client/resources/repository.go @@ -6,8 +6,8 @@ package resources import ( "context" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/juju/charmhub" diff --git a/apiserver/facades/client/resources/repository_test.go b/apiserver/facades/client/resources/repository_test.go index 91210f7f673d..8ab675a18e94 100644 --- a/apiserver/facades/client/resources/repository_test.go +++ b/apiserver/facades/client/resources/repository_test.go @@ -6,8 +6,8 @@ package resources_test import ( "time" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" jc "github.com/juju/testing/checkers" "github.com/juju/utils/v3/hash" "go.uber.org/mock/gomock" diff --git a/apiserver/facades/client/resources/server_addpending_test.go b/apiserver/facades/client/resources/server_addpending_test.go index 3f9779351270..1c5c8c405dd8 100644 --- a/apiserver/facades/client/resources/server_addpending_test.go +++ b/apiserver/facades/client/resources/server_addpending_test.go @@ -4,8 +4,8 @@ package resources_test import ( - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/client/resources/server_listresources_test.go b/apiserver/facades/client/resources/server_listresources_test.go index 2ed1d247b280..0276c57169d0 100644 --- a/apiserver/facades/client/resources/server_listresources_test.go +++ b/apiserver/facades/client/resources/server_listresources_test.go @@ -4,7 +4,7 @@ package resources_test import ( - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/client/resources/server_test.go b/apiserver/facades/client/resources/server_test.go index f3c36fd16e64..92a6829350ed 100644 --- a/apiserver/facades/client/resources/server_test.go +++ b/apiserver/facades/client/resources/server_test.go @@ -4,7 +4,7 @@ package resources_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/apiserver/facades/client/storage/mock_test.go b/apiserver/facades/client/storage/mock_test.go index 38555f93099c..a9eca77b8325 100644 --- a/apiserver/facades/client/storage/mock_test.go +++ b/apiserver/facades/client/storage/mock_test.go @@ -6,7 +6,7 @@ package storage_test import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/controller/caasapplicationprovisioner/mock_test.go b/apiserver/facades/controller/caasapplicationprovisioner/mock_test.go index 85040575dcbe..4424c099ebcc 100644 --- a/apiserver/facades/controller/caasapplicationprovisioner/mock_test.go +++ b/apiserver/facades/controller/caasapplicationprovisioner/mock_test.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/apiserver/facades/controller/caasapplicationprovisioner/provisioner.go b/apiserver/facades/controller/caasapplicationprovisioner/provisioner.go index 9bc0861f03e0..d9dce9a2ba1b 100644 --- a/apiserver/facades/controller/caasapplicationprovisioner/provisioner.go +++ b/apiserver/facades/controller/caasapplicationprovisioner/provisioner.go @@ -10,7 +10,7 @@ import ( "sort" "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/clock" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/apiserver/facades/controller/caasapplicationprovisioner/provisioner_test.go b/apiserver/facades/controller/caasapplicationprovisioner/provisioner_test.go index b29591f02ca5..d667c7ffda0b 100644 --- a/apiserver/facades/controller/caasapplicationprovisioner/provisioner_test.go +++ b/apiserver/facades/controller/caasapplicationprovisioner/provisioner_test.go @@ -6,8 +6,8 @@ package caasapplicationprovisioner_test import ( "time" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/clock" "github.com/juju/clock/testclock" "github.com/juju/names/v4" diff --git a/apiserver/facades/controller/caasapplicationprovisioner/state.go b/apiserver/facades/controller/caasapplicationprovisioner/state.go index 5ac66f7e77c3..ca9fcb4cc53a 100644 --- a/apiserver/facades/controller/caasapplicationprovisioner/state.go +++ b/apiserver/facades/controller/caasapplicationprovisioner/state.go @@ -7,7 +7,7 @@ import ( "io" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/juju/controller" diff --git a/apiserver/facades/controller/caasfirewaller/firewaller_test.go b/apiserver/facades/controller/caasfirewaller/firewaller_test.go index dc5b5a6cd76c..ab7863414652 100644 --- a/apiserver/facades/controller/caasfirewaller/firewaller_test.go +++ b/apiserver/facades/controller/caasfirewaller/firewaller_test.go @@ -4,7 +4,7 @@ package caasfirewaller_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" "github.com/juju/worker/v3/workertest" diff --git a/apiserver/facades/controller/caasfirewaller/mock_test.go b/apiserver/facades/controller/caasfirewaller/mock_test.go index e9cab07d0013..64ff6dca93ec 100644 --- a/apiserver/facades/controller/caasfirewaller/mock_test.go +++ b/apiserver/facades/controller/caasfirewaller/mock_test.go @@ -4,7 +4,7 @@ package caasfirewaller_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/apiserver/facades/controller/caasoperatorprovisioner/mock_test.go b/apiserver/facades/controller/caasoperatorprovisioner/mock_test.go index dda1cdf65e39..0b03d68bed87 100644 --- a/apiserver/facades/controller/caasoperatorprovisioner/mock_test.go +++ b/apiserver/facades/controller/caasoperatorprovisioner/mock_test.go @@ -4,7 +4,7 @@ package caasoperatorprovisioner_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/apiserver/facades/controller/caasoperatorprovisioner/provisioner.go b/apiserver/facades/controller/caasoperatorprovisioner/provisioner.go index 4018468de75e..fb92a64f2f74 100644 --- a/apiserver/facades/controller/caasoperatorprovisioner/provisioner.go +++ b/apiserver/facades/controller/caasoperatorprovisioner/provisioner.go @@ -6,7 +6,7 @@ package caasoperatorprovisioner import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/apiserver/facades/controller/caasoperatorprovisioner/provisioner_test.go b/apiserver/facades/controller/caasoperatorprovisioner/provisioner_test.go index 4a94865537bd..48264dd49797 100644 --- a/apiserver/facades/controller/caasoperatorprovisioner/provisioner_test.go +++ b/apiserver/facades/controller/caasoperatorprovisioner/provisioner_test.go @@ -6,7 +6,7 @@ package caasoperatorprovisioner_test import ( "crypto/x509" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/controller/caasunitprovisioner/mock_test.go b/apiserver/facades/controller/caasunitprovisioner/mock_test.go index 4776c0f7b6df..17ac1545a6a1 100644 --- a/apiserver/facades/controller/caasunitprovisioner/mock_test.go +++ b/apiserver/facades/controller/caasunitprovisioner/mock_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/apiserver/facades/controller/caasunitprovisioner/provisioner.go b/apiserver/facades/controller/caasunitprovisioner/provisioner.go index 4ef1cde185e6..d049f02c51cc 100644 --- a/apiserver/facades/controller/caasunitprovisioner/provisioner.go +++ b/apiserver/facades/controller/caasunitprovisioner/provisioner.go @@ -8,7 +8,7 @@ import ( "sort" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/apiserver/facades/controller/caasunitprovisioner/provisioner_test.go b/apiserver/facades/controller/caasunitprovisioner/provisioner_test.go index 919d3f04979d..ee1c02be5e28 100644 --- a/apiserver/facades/controller/caasunitprovisioner/provisioner_test.go +++ b/apiserver/facades/controller/caasunitprovisioner/provisioner_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/clock/testclock" "github.com/juju/names/v4" diff --git a/apiserver/facades/controller/charmdownloader/charmdownloader_test.go b/apiserver/facades/controller/charmdownloader/charmdownloader_test.go index 476aec42e407..4bdb5a378de5 100644 --- a/apiserver/facades/controller/charmdownloader/charmdownloader_test.go +++ b/apiserver/facades/controller/charmdownloader/charmdownloader_test.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock/testclock" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/controller/charmdownloader/interfaces.go b/apiserver/facades/controller/charmdownloader/interfaces.go index 852ffd6c1db5..1e1e4c79bf3d 100644 --- a/apiserver/facades/controller/charmdownloader/interfaces.go +++ b/apiserver/facades/controller/charmdownloader/interfaces.go @@ -4,7 +4,7 @@ package charmdownloader import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/juju/apiserver/facades/client/charms/services" "github.com/juju/juju/controller" diff --git a/apiserver/facades/controller/charmdownloader/mocks/mocks.go b/apiserver/facades/controller/charmdownloader/mocks/mocks.go index 5e8b175bfa81..0ce296b5315b 100644 --- a/apiserver/facades/controller/charmdownloader/mocks/mocks.go +++ b/apiserver/facades/controller/charmdownloader/mocks/mocks.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" services "github.com/juju/juju/apiserver/facades/client/charms/services" charmdownloader "github.com/juju/juju/apiserver/facades/controller/charmdownloader" controller "github.com/juju/juju/controller" diff --git a/apiserver/facades/controller/charmdownloader/shims.go b/apiserver/facades/controller/charmdownloader/shims.go index e8c42b04321b..9605c8807c84 100644 --- a/apiserver/facades/controller/charmdownloader/shims.go +++ b/apiserver/facades/controller/charmdownloader/shims.go @@ -4,7 +4,7 @@ package charmdownloader import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/juju/apiserver/facade" diff --git a/apiserver/facades/controller/charmrevisionupdater/charmhub.go b/apiserver/facades/controller/charmrevisionupdater/charmhub.go index f93ef93a54c6..96b0ce9d3df3 100644 --- a/apiserver/facades/controller/charmrevisionupdater/charmhub.go +++ b/apiserver/facades/controller/charmrevisionupdater/charmhub.go @@ -9,7 +9,7 @@ import ( "context" "time" - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/juju/charmhub" diff --git a/apiserver/facades/controller/charmrevisionupdater/interface.go b/apiserver/facades/controller/charmrevisionupdater/interface.go index 5dd657a63520..5a1ac1991200 100644 --- a/apiserver/facades/controller/charmrevisionupdater/interface.go +++ b/apiserver/facades/controller/charmrevisionupdater/interface.go @@ -4,7 +4,7 @@ package charmrevisionupdater import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/facades/controller/charmrevisionupdater/interface_test.go b/apiserver/facades/controller/charmrevisionupdater/interface_test.go index 93e4992b95f9..8d8fa613d1da 100644 --- a/apiserver/facades/controller/charmrevisionupdater/interface_test.go +++ b/apiserver/facades/controller/charmrevisionupdater/interface_test.go @@ -4,8 +4,8 @@ package charmrevisionupdater_test import ( - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/resource" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/apiserver/facades/controller/charmrevisionupdater/mocks/mocks.go b/apiserver/facades/controller/charmrevisionupdater/mocks/mocks.go index 97dae54e8aa0..ed2b0175c9b9 100644 --- a/apiserver/facades/controller/charmrevisionupdater/mocks/mocks.go +++ b/apiserver/facades/controller/charmrevisionupdater/mocks/mocks.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" charmrevisionupdater "github.com/juju/juju/apiserver/facades/controller/charmrevisionupdater" charmhub "github.com/juju/juju/charmhub" transport "github.com/juju/juju/charmhub/transport" diff --git a/apiserver/facades/controller/charmrevisionupdater/updater.go b/apiserver/facades/controller/charmrevisionupdater/updater.go index e2530ac2820d..02489db22ef9 100644 --- a/apiserver/facades/controller/charmrevisionupdater/updater.go +++ b/apiserver/facades/controller/charmrevisionupdater/updater.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/resource" "github.com/juju/clock" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/apiserver/facades/controller/charmrevisionupdater/updater_test.go b/apiserver/facades/controller/charmrevisionupdater/updater_test.go index 5e71368ca97c..dd72c73406d0 100644 --- a/apiserver/facades/controller/charmrevisionupdater/updater_test.go +++ b/apiserver/facades/controller/charmrevisionupdater/updater_test.go @@ -6,8 +6,8 @@ package charmrevisionupdater_test import ( "time" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/resource" "github.com/juju/clock" "github.com/juju/clock/testclock" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/controller/crossmodelrelations/crossmodelrelations.go b/apiserver/facades/controller/crossmodelrelations/crossmodelrelations.go index 2f98322de67b..b6557256d2b4 100644 --- a/apiserver/facades/controller/crossmodelrelations/crossmodelrelations.go +++ b/apiserver/facades/controller/crossmodelrelations/crossmodelrelations.go @@ -10,7 +10,7 @@ import ( "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery" "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery/checkers" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/apiserver/facades/controller/crossmodelrelations/crossmodelrelations_test.go b/apiserver/facades/controller/crossmodelrelations/crossmodelrelations_test.go index 30ac54d759af..c3c7492b8061 100644 --- a/apiserver/facades/controller/crossmodelrelations/crossmodelrelations_test.go +++ b/apiserver/facades/controller/crossmodelrelations/crossmodelrelations_test.go @@ -11,7 +11,7 @@ import ( "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery" "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery/checkers" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/apiserver/facades/controller/remoterelations/remoterelations_test.go b/apiserver/facades/controller/remoterelations/remoterelations_test.go index b9e80f12510c..882e2aba7489 100644 --- a/apiserver/facades/controller/remoterelations/remoterelations_test.go +++ b/apiserver/facades/controller/remoterelations/remoterelations_test.go @@ -4,7 +4,7 @@ package remoterelations_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/apiserver/mocks/resources_mock.go b/apiserver/mocks/resources_mock.go index c1e55dfa0850..68ecd231ea51 100644 --- a/apiserver/mocks/resources_mock.go +++ b/apiserver/mocks/resources_mock.go @@ -9,7 +9,7 @@ import ( reflect "reflect" time "time" - resource "github.com/juju/charm/v10/resource" + resource "github.com/juju/charm/v11/resource" resources "github.com/juju/juju/core/resources" state "github.com/juju/juju/state" gomock "go.uber.org/mock/gomock" diff --git a/apiserver/resources.go b/apiserver/resources.go index 277b0a79bd6d..c8dc8df06b36 100644 --- a/apiserver/resources.go +++ b/apiserver/resources.go @@ -12,7 +12,7 @@ import ( "path" "strconv" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/resources_mig.go b/apiserver/resources_mig.go index 68a1743cdb68..947cdc6232e5 100644 --- a/apiserver/resources_mig.go +++ b/apiserver/resources_mig.go @@ -9,7 +9,7 @@ import ( "net/url" "strconv" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/juju/core/resources" diff --git a/apiserver/resources_mig_test.go b/apiserver/resources_mig_test.go index 22405a60b8d2..43d602834bf1 100644 --- a/apiserver/resources_mig_test.go +++ b/apiserver/resources_mig_test.go @@ -13,7 +13,7 @@ import ( "strings" "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" gc "gopkg.in/check.v1" diff --git a/apiserver/resources_test.go b/apiserver/resources_test.go index a5380aaaea9e..aeaf00416445 100644 --- a/apiserver/resources_test.go +++ b/apiserver/resources_test.go @@ -13,7 +13,7 @@ import ( "strings" "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/apiserver/rest_test.go b/apiserver/rest_test.go index aa0cb736663d..d7986a577087 100644 --- a/apiserver/rest_test.go +++ b/apiserver/rest_test.go @@ -13,7 +13,7 @@ import ( "path/filepath" "runtime" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/apiserver/testing/application.go b/apiserver/testing/application.go index 2b34fa7452ea..bbc7b2eac9dc 100644 --- a/apiserver/testing/application.go +++ b/apiserver/testing/application.go @@ -4,7 +4,7 @@ package testing import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/caas/kubernetes/provider/bootstrap.go b/caas/kubernetes/provider/bootstrap.go index e8cc09bf43bc..9b1a2444887e 100644 --- a/caas/kubernetes/provider/bootstrap.go +++ b/caas/kubernetes/provider/bootstrap.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/featureflag" diff --git a/caas/kubernetes/provider/operator_upgrade.go b/caas/kubernetes/provider/operator_upgrade.go index 11cabee7edb7..f674af8061a4 100644 --- a/caas/kubernetes/provider/operator_upgrade.go +++ b/caas/kubernetes/provider/operator_upgrade.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/caas/kubernetes/provider/providerconfig.go b/caas/kubernetes/provider/providerconfig.go index 24e9479623f0..3257fe0cc45f 100644 --- a/caas/kubernetes/provider/providerconfig.go +++ b/caas/kubernetes/provider/providerconfig.go @@ -6,7 +6,7 @@ package provider import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/schema" "github.com/juju/version/v2" "gopkg.in/juju/environschema.v1" diff --git a/charmhub/client.go b/charmhub/client.go index 9524b147ff8a..290531a9f606 100644 --- a/charmhub/client.go +++ b/charmhub/client.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/charmhub/download.go b/charmhub/download.go index 365c8ee2d02a..ca61bd8cbcb6 100644 --- a/charmhub/download.go +++ b/charmhub/download.go @@ -10,7 +10,7 @@ import ( "net/url" "os" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" ) diff --git a/cloudconfig/instancecfg/instancecfg.go b/cloudconfig/instancecfg/instancecfg.go index 51e1e4e46446..534bb534e356 100644 --- a/cloudconfig/instancecfg/instancecfg.go +++ b/cloudconfig/instancecfg/instancecfg.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/cloudconfig/podcfg/image.go b/cloudconfig/podcfg/image.go index cff060c281ca..03dc0111daee 100644 --- a/cloudconfig/podcfg/image.go +++ b/cloudconfig/podcfg/image.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/docker/distribution/reference" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/version/v2" diff --git a/cloudconfig/podcfg/image_test.go b/cloudconfig/podcfg/image_test.go index 5cb4db16f783..261b5b51fb9d 100644 --- a/cloudconfig/podcfg/image_test.go +++ b/cloudconfig/podcfg/image_test.go @@ -4,7 +4,7 @@ package podcfg_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" "github.com/juju/version/v2" gc "gopkg.in/check.v1" diff --git a/cloudconfig/userdatacfg_test.go b/cloudconfig/userdatacfg_test.go index 67b45242df31..aa530eeff665 100644 --- a/cloudconfig/userdatacfg_test.go +++ b/cloudconfig/userdatacfg_test.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/cloudconfig/userdatacfg_unix.go b/cloudconfig/userdatacfg_unix.go index a75177018425..330bb8ac250e 100644 --- a/cloudconfig/userdatacfg_unix.go +++ b/cloudconfig/userdatacfg_unix.go @@ -14,7 +14,7 @@ import ( "strings" "text/template" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/featureflag" "github.com/juju/loggo" diff --git a/cmd/juju/action/common.go b/cmd/juju/action/common.go index d38595b3c650..2cbbcbeb4759 100644 --- a/cmd/juju/action/common.go +++ b/cmd/juju/action/common.go @@ -16,7 +16,7 @@ import ( "time" "github.com/juju/ansiterm" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/cmd/v3" "github.com/juju/collections/set" diff --git a/cmd/juju/agree/agree/agree.go b/cmd/juju/agree/agree/agree.go index 790bddd0cae6..44b75694724c 100644 --- a/cmd/juju/agree/agree/agree.go +++ b/cmd/juju/agree/agree/agree.go @@ -12,7 +12,7 @@ import ( "os/exec" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/gnuflag" diff --git a/cmd/juju/application/bundle/bundle.go b/cmd/juju/application/bundle/bundle.go index 5af3cae1a8e8..deb3a258ebd1 100644 --- a/cmd/juju/application/bundle/bundle.go +++ b/cmd/juju/application/bundle/bundle.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/cmd/juju/application/bundle/bundle_test.go b/cmd/juju/application/bundle/bundle_test.go index 7833e459e9ed..a93355529307 100644 --- a/cmd/juju/application/bundle/bundle_test.go +++ b/cmd/juju/application/bundle/bundle_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/cmd/juju/application/bundle/interface.go b/cmd/juju/application/bundle/interface.go index e4d707839e7c..e21d36156436 100644 --- a/cmd/juju/application/bundle/interface.go +++ b/cmd/juju/application/bundle/interface.go @@ -4,7 +4,7 @@ package bundle import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/juju/core/constraints" "github.com/juju/juju/rpc/params" diff --git a/cmd/juju/application/bundle/mocks/bundledatasource_mock.go b/cmd/juju/application/bundle/mocks/bundledatasource_mock.go index 7196a7b2be28..ad14e151f957 100644 --- a/cmd/juju/application/bundle/mocks/bundledatasource_mock.go +++ b/cmd/juju/application/bundle/mocks/bundledatasource_mock.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" gomock "go.uber.org/mock/gomock" ) diff --git a/cmd/juju/application/bundle_test.go b/cmd/juju/application/bundle_test.go index 3677ac1df669..47d4fcb3af33 100644 --- a/cmd/juju/application/bundle_test.go +++ b/cmd/juju/application/bundle_test.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/cmd/juju/application/deploy.go b/cmd/juju/application/deploy.go index 5a9f032f29b3..fd30587f5e5c 100644 --- a/cmd/juju/application/deploy.go +++ b/cmd/juju/application/deploy.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/cmd/juju/application/deploy_test.go b/cmd/juju/application/deploy_test.go index 048f3fb1debe..13cefbdf3a74 100644 --- a/cmd/juju/application/deploy_test.go +++ b/cmd/juju/application/deploy_test.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/cmd/v3" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/collections/set" diff --git a/cmd/juju/application/deployer/bundle.go b/cmd/juju/application/deployer/bundle.go index 59630bfa74e9..0a11d3834670 100644 --- a/cmd/juju/application/deployer/bundle.go +++ b/cmd/juju/application/deployer/bundle.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/cmd/juju/application/deployer/bundlehandler.go b/cmd/juju/application/deployer/bundlehandler.go index c188567e0f37..f1a96e660a0e 100644 --- a/cmd/juju/application/deployer/bundlehandler.go +++ b/cmd/juju/application/deployer/bundlehandler.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" jujuclock "github.com/juju/clock" "github.com/juju/cmd/v3" "github.com/juju/collections/set" diff --git a/cmd/juju/application/deployer/bundlehandler_test.go b/cmd/juju/application/deployer/bundlehandler_test.go index b3b6a9d38f9c..5cfa72f63c8f 100644 --- a/cmd/juju/application/deployer/bundlehandler_test.go +++ b/cmd/juju/application/deployer/bundlehandler_test.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/cmd/v3" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/cmd/juju/application/deployer/charm.go b/cmd/juju/application/deployer/charm.go index a517360e7b8b..6f328ea7926a 100644 --- a/cmd/juju/application/deployer/charm.go +++ b/cmd/juju/application/deployer/charm.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jujuclock "github.com/juju/clock" "github.com/juju/cmd/v3" "github.com/juju/errors" diff --git a/cmd/juju/application/deployer/charm_test.go b/cmd/juju/application/deployer/charm_test.go index 17eb4e96aab9..4d95a127970a 100644 --- a/cmd/juju/application/deployer/charm_test.go +++ b/cmd/juju/application/deployer/charm_test.go @@ -6,8 +6,8 @@ package deployer import ( "bytes" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/clock" "github.com/juju/cmd/v3" "github.com/juju/cmd/v3/cmdtesting" diff --git a/cmd/juju/application/deployer/deployer.go b/cmd/juju/application/deployer/deployer.go index 504d5a96308a..884c78411f93 100644 --- a/cmd/juju/application/deployer/deployer.go +++ b/cmd/juju/application/deployer/deployer.go @@ -11,8 +11,8 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" jujuclock "github.com/juju/clock" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/cmd/juju/application/deployer/deployer_test.go b/cmd/juju/application/deployer/deployer_test.go index 0bfba50eaf1a..f1dc52017f90 100644 --- a/cmd/juju/application/deployer/deployer_test.go +++ b/cmd/juju/application/deployer/deployer_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/go-macaroon-bakery/macaroon-bakery/v3/httpbakery" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/clock" "github.com/juju/cmd/v3" "github.com/juju/collections/set" diff --git a/cmd/juju/application/deployer/interface.go b/cmd/juju/application/deployer/interface.go index 7b778a03e703..19cc07980f36 100644 --- a/cmd/juju/application/deployer/interface.go +++ b/cmd/juju/application/deployer/interface.go @@ -5,8 +5,8 @@ package deployer import ( "github.com/go-macaroon-bakery/macaroon-bakery/v3/httpbakery" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/cmd/v3" "github.com/juju/gnuflag" "github.com/juju/names/v4" diff --git a/cmd/juju/application/deployer/lxdprofilestep.go b/cmd/juju/application/deployer/lxdprofilestep.go index 5f4383c67240..521bd12d2972 100644 --- a/cmd/juju/application/deployer/lxdprofilestep.go +++ b/cmd/juju/application/deployer/lxdprofilestep.go @@ -5,7 +5,7 @@ package deployer import ( "github.com/go-macaroon-bakery/macaroon-bakery/v3/httpbakery" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/gnuflag" diff --git a/cmd/juju/application/deployer/lxdprofilestep_test.go b/cmd/juju/application/deployer/lxdprofilestep_test.go index 71abf83e763d..b858322a6361 100644 --- a/cmd/juju/application/deployer/lxdprofilestep_test.go +++ b/cmd/juju/application/deployer/lxdprofilestep_test.go @@ -4,7 +4,7 @@ package deployer_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/testing" "go.uber.org/mock/gomock" gc "gopkg.in/check.v1" diff --git a/cmd/juju/application/deployer/mocks/charm_mock.go b/cmd/juju/application/deployer/mocks/charm_mock.go index a5a9fde3a6b4..f88249a98ca9 100644 --- a/cmd/juju/application/deployer/mocks/charm_mock.go +++ b/cmd/juju/application/deployer/mocks/charm_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/juju/charm/v10 (interfaces: Charm) +// Source: github.com/juju/charm/v11 (interfaces: Charm) // Package mocks is a generated GoMock package. package mocks @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" gomock "go.uber.org/mock/gomock" ) diff --git a/cmd/juju/application/deployer/mocks/deploy_mock.go b/cmd/juju/application/deployer/mocks/deploy_mock.go index 5b7c0b6f1764..2003f5b35adc 100644 --- a/cmd/juju/application/deployer/mocks/deploy_mock.go +++ b/cmd/juju/application/deployer/mocks/deploy_mock.go @@ -10,8 +10,8 @@ import ( url "net/url" reflect "reflect" - charm "github.com/juju/charm/v10" - resource "github.com/juju/charm/v10/resource" + charm "github.com/juju/charm/v11" + resource "github.com/juju/charm/v11/resource" cmd "github.com/juju/cmd/v3" api "github.com/juju/juju/api" base "github.com/juju/juju/api/base" diff --git a/cmd/juju/application/deployer/mocks/resolver_mock.go b/cmd/juju/application/deployer/mocks/resolver_mock.go index e6ca133d536d..e519874cedcc 100644 --- a/cmd/juju/application/deployer/mocks/resolver_mock.go +++ b/cmd/juju/application/deployer/mocks/resolver_mock.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" charm0 "github.com/juju/juju/api/common/charm" gomock "go.uber.org/mock/gomock" ) diff --git a/cmd/juju/application/deployer/package_test.go b/cmd/juju/application/deployer/package_test.go index ff4c11ee5754..63c0b43b4b35 100644 --- a/cmd/juju/application/deployer/package_test.go +++ b/cmd/juju/application/deployer/package_test.go @@ -15,7 +15,7 @@ import ( //go:generate go run go.uber.org/mock/mockgen -package mocks -destination mocks/api_mock.go github.com/juju/juju/api AllWatch //go:generate go run go.uber.org/mock/mockgen -package mocks -destination mocks/modelcmd_mock.go github.com/juju/juju/cmd/modelcmd Filesystem //go:generate go run go.uber.org/mock/mockgen -package mocks -destination mocks/write_mock.go io Writer -//go:generate go run go.uber.org/mock/mockgen -package mocks -destination mocks/charm_mock.go github.com/juju/charm/v10 Charm +//go:generate go run go.uber.org/mock/mockgen -package mocks -destination mocks/charm_mock.go github.com/juju/charm/v11 Charm func TestPackage(t *testing.T) { gc.TestingT(t) diff --git a/cmd/juju/application/deployer/resource.go b/cmd/juju/application/deployer/resource.go index 6852bde638e7..7b61aaa6f4e9 100644 --- a/cmd/juju/application/deployer/resource.go +++ b/cmd/juju/application/deployer/resource.go @@ -6,7 +6,7 @@ package deployer import ( "strconv" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/juju/api/base" diff --git a/cmd/juju/application/diffbundle.go b/cmd/juju/application/diffbundle.go index 79d506d04b1e..8a325cd764c4 100644 --- a/cmd/juju/application/diffbundle.go +++ b/cmd/juju/application/diffbundle.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/gnuflag" diff --git a/cmd/juju/application/diffbundle_test.go b/cmd/juju/application/diffbundle_test.go index ed20ba2d9ffd..488bafb252a7 100644 --- a/cmd/juju/application/diffbundle_test.go +++ b/cmd/juju/application/diffbundle_test.go @@ -10,7 +10,7 @@ import ( "reflect" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/errors" diff --git a/cmd/juju/application/export_test.go b/cmd/juju/application/export_test.go index 82ed6a1d5028..3dc161bc9cd4 100644 --- a/cmd/juju/application/export_test.go +++ b/cmd/juju/application/export_test.go @@ -6,7 +6,7 @@ package application import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/collections/set" gc "gopkg.in/check.v1" diff --git a/cmd/juju/application/refresh.go b/cmd/juju/application/refresh.go index 275b0272d3ab..64e51391d40e 100644 --- a/cmd/juju/application/refresh.go +++ b/cmd/juju/application/refresh.go @@ -7,7 +7,7 @@ import ( "fmt" "strconv" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/cmd/juju/application/refresh_test.go b/cmd/juju/application/refresh_test.go index 1cbd7d7d7d48..16ff913f774a 100644 --- a/cmd/juju/application/refresh_test.go +++ b/cmd/juju/application/refresh_test.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/cmd/v3" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/collections/set" diff --git a/cmd/juju/application/refresher/charm_mock_test.go b/cmd/juju/application/refresher/charm_mock_test.go index 4866908288ab..94307a9f5568 100644 --- a/cmd/juju/application/refresher/charm_mock_test.go +++ b/cmd/juju/application/refresher/charm_mock_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/juju/charm/v10 (interfaces: Charm) +// Source: github.com/juju/charm/v11 (interfaces: Charm) // Package refresher is a generated GoMock package. package refresher @@ -7,7 +7,7 @@ package refresher import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" gomock "go.uber.org/mock/gomock" ) diff --git a/cmd/juju/application/refresher/interface.go b/cmd/juju/application/refresher/interface.go index 3e1500ec23a7..98c832d7f1f3 100644 --- a/cmd/juju/application/refresher/interface.go +++ b/cmd/juju/application/refresher/interface.go @@ -4,7 +4,7 @@ package refresher import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" commoncharm "github.com/juju/juju/api/common/charm" corecharm "github.com/juju/juju/core/charm" diff --git a/cmd/juju/application/refresher/package_test.go b/cmd/juju/application/refresher/package_test.go index 74973ee762c8..f81acccea369 100644 --- a/cmd/juju/application/refresher/package_test.go +++ b/cmd/juju/application/refresher/package_test.go @@ -11,7 +11,7 @@ import ( //go:generate go run go.uber.org/mock/mockgen -package refresher -destination refresher_mock_test.go github.com/juju/juju/cmd/juju/application/refresher RefresherFactory,Refresher,CharmResolver,CharmRepository //go:generate go run go.uber.org/mock/mockgen -package refresher -destination store_mock_test.go github.com/juju/juju/cmd/juju/application/store CharmAdder -//go:generate go run go.uber.org/mock/mockgen -package refresher -destination charm_mock_test.go github.com/juju/charm/v10 Charm +//go:generate go run go.uber.org/mock/mockgen -package refresher -destination charm_mock_test.go github.com/juju/charm/v11 Charm func TestPackage(t *testing.T) { gc.TestingT(t) diff --git a/cmd/juju/application/refresher/refresher.go b/cmd/juju/application/refresher/refresher.go index d6fa10301aa4..07220177a4d4 100644 --- a/cmd/juju/application/refresher/refresher.go +++ b/cmd/juju/application/refresher/refresher.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jujuclock "github.com/juju/clock" "github.com/juju/errors" diff --git a/cmd/juju/application/refresher/refresher_mock_test.go b/cmd/juju/application/refresher/refresher_mock_test.go index 1ce8df71dbdf..406575102dad 100644 --- a/cmd/juju/application/refresher/refresher_mock_test.go +++ b/cmd/juju/application/refresher/refresher_mock_test.go @@ -7,7 +7,7 @@ package refresher import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" charm0 "github.com/juju/juju/api/common/charm" gomock "go.uber.org/mock/gomock" ) diff --git a/cmd/juju/application/refresher/refresher_test.go b/cmd/juju/application/refresher/refresher_test.go index 5954acaefc69..bbaeec23a150 100644 --- a/cmd/juju/application/refresher/refresher_test.go +++ b/cmd/juju/application/refresher/refresher_test.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/cmd/juju/application/refresher/store_mock_test.go b/cmd/juju/application/refresher/store_mock_test.go index 43a3735e66c9..d19bb56e2bb3 100644 --- a/cmd/juju/application/refresher/store_mock_test.go +++ b/cmd/juju/application/refresher/store_mock_test.go @@ -7,7 +7,7 @@ package refresher import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" charm0 "github.com/juju/juju/api/common/charm" gomock "go.uber.org/mock/gomock" ) diff --git a/cmd/juju/application/store/charmadapter.go b/cmd/juju/application/store/charmadapter.go index 9e99bf6ee7fc..cb7acb577cf3 100644 --- a/cmd/juju/application/store/charmadapter.go +++ b/cmd/juju/application/store/charmadapter.go @@ -7,7 +7,7 @@ import ( "context" "net/url" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" apicharm "github.com/juju/juju/api/client/charms" diff --git a/cmd/juju/application/store/charmadapter_test.go b/cmd/juju/application/store/charmadapter_test.go index 2b29443d7930..4ec09f69167d 100644 --- a/cmd/juju/application/store/charmadapter_test.go +++ b/cmd/juju/application/store/charmadapter_test.go @@ -6,7 +6,7 @@ package store_test import ( "net/url" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/cmd/juju/application/store/interface.go b/cmd/juju/application/store/interface.go index 82b5af324cc8..53f8315d7074 100644 --- a/cmd/juju/application/store/interface.go +++ b/cmd/juju/application/store/interface.go @@ -4,7 +4,7 @@ package store import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" apicharm "github.com/juju/juju/api/client/charms" commoncharm "github.com/juju/juju/api/common/charm" diff --git a/cmd/juju/application/store/mocks/charm_mock.go b/cmd/juju/application/store/mocks/charm_mock.go index e8956f579c2e..2fe30501d56a 100644 --- a/cmd/juju/application/store/mocks/charm_mock.go +++ b/cmd/juju/application/store/mocks/charm_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/juju/charm/v10 (interfaces: Bundle) +// Source: github.com/juju/charm/v11 (interfaces: Bundle) // Package mocks is a generated GoMock package. package mocks @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" gomock "go.uber.org/mock/gomock" ) diff --git a/cmd/juju/application/store/mocks/store_mock.go b/cmd/juju/application/store/mocks/store_mock.go index 11a7f60a264d..9c768cac9e25 100644 --- a/cmd/juju/application/store/mocks/store_mock.go +++ b/cmd/juju/application/store/mocks/store_mock.go @@ -9,7 +9,7 @@ import ( url "net/url" reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" charms "github.com/juju/juju/api/client/charms" charm0 "github.com/juju/juju/api/common/charm" charmhub "github.com/juju/juju/charmhub" diff --git a/cmd/juju/application/store/package_test.go b/cmd/juju/application/store/package_test.go index a3f10f752548..5feff2fad2e6 100644 --- a/cmd/juju/application/store/package_test.go +++ b/cmd/juju/application/store/package_test.go @@ -10,7 +10,7 @@ import ( ) //go:generate go run go.uber.org/mock/mockgen -package mocks -destination ./mocks/store_mock.go github.com/juju/juju/cmd/juju/application/store CharmAdder,CharmsAPI,DownloadBundleClient -//go:generate go run go.uber.org/mock/mockgen -package mocks -destination ./mocks/charm_mock.go github.com/juju/charm/v10 Bundle +//go:generate go run go.uber.org/mock/mockgen -package mocks -destination ./mocks/charm_mock.go github.com/juju/charm/v11 Bundle func TestPackage(t *testing.T) { gc.TestingT(t) diff --git a/cmd/juju/application/store/resolve.go b/cmd/juju/application/store/resolve.go index 65716504dcee..6cff051ac79c 100644 --- a/cmd/juju/application/store/resolve.go +++ b/cmd/juju/application/store/resolve.go @@ -4,7 +4,7 @@ package store import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" ) diff --git a/cmd/juju/application/store/store.go b/cmd/juju/application/store/store.go index cb4152dc3566..b30136ddc98e 100644 --- a/cmd/juju/application/store/store.go +++ b/cmd/juju/application/store/store.go @@ -4,7 +4,7 @@ package store import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" commoncharm "github.com/juju/juju/api/common/charm" diff --git a/cmd/juju/application/store/store_test.go b/cmd/juju/application/store/store_test.go index 2c44f3d82e1e..da641f47a9cc 100644 --- a/cmd/juju/application/store/store_test.go +++ b/cmd/juju/application/store/store_test.go @@ -4,7 +4,7 @@ package store_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/cmd/juju/application/unexpose_test.go b/cmd/juju/application/unexpose_test.go index fb7de09e90e1..9da892c1bf6b 100644 --- a/cmd/juju/application/unexpose_test.go +++ b/cmd/juju/application/unexpose_test.go @@ -7,7 +7,7 @@ import ( "runtime" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/cmd/juju/application/utils/interface.go b/cmd/juju/application/utils/interface.go index b73608a866cc..7bebff54eda7 100644 --- a/cmd/juju/application/utils/interface.go +++ b/cmd/juju/application/utils/interface.go @@ -4,8 +4,8 @@ package utils import ( - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" apicharm "github.com/juju/juju/api/common/charm" "github.com/juju/juju/api/common/charms" diff --git a/cmd/juju/application/utils/mocks/charmresource_mock.go b/cmd/juju/application/utils/mocks/charmresource_mock.go index 6ae0cc26315d..7eb9c94103fe 100644 --- a/cmd/juju/application/utils/mocks/charmresource_mock.go +++ b/cmd/juju/application/utils/mocks/charmresource_mock.go @@ -7,8 +7,8 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" - resource "github.com/juju/charm/v10/resource" + charm "github.com/juju/charm/v11" + resource "github.com/juju/charm/v11/resource" charm0 "github.com/juju/juju/api/common/charm" charms "github.com/juju/juju/api/common/charms" gomock "go.uber.org/mock/gomock" diff --git a/cmd/juju/application/utils/origin.go b/cmd/juju/application/utils/origin.go index 7335f235f951..4a08ed37dc80 100644 --- a/cmd/juju/application/utils/origin.go +++ b/cmd/juju/application/utils/origin.go @@ -4,7 +4,7 @@ package utils import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" commoncharm "github.com/juju/juju/api/common/charm" diff --git a/cmd/juju/application/utils/utils.go b/cmd/juju/application/utils/utils.go index 9c21a26b8f4b..2c35cd55658d 100644 --- a/cmd/juju/application/utils/utils.go +++ b/cmd/juju/application/utils/utils.go @@ -9,8 +9,8 @@ import ( "os" "strconv" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/gnuflag" diff --git a/cmd/juju/application/utils/utils_test.go b/cmd/juju/application/utils/utils_test.go index 6c9b716d1d17..3455b6dd8a24 100644 --- a/cmd/juju/application/utils/utils_test.go +++ b/cmd/juju/application/utils/utils_test.go @@ -4,8 +4,8 @@ package utils_test import ( - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/gnuflag" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/cmd/juju/charmhub/convert.go b/cmd/juju/charmhub/convert.go index c80717182ac1..f3cdd1ccabf8 100644 --- a/cmd/juju/charmhub/convert.go +++ b/cmd/juju/charmhub/convert.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/cmd/juju/charmhub/data.go b/cmd/juju/charmhub/data.go index 6f4b680fd5fe..554f8b806e65 100644 --- a/cmd/juju/charmhub/data.go +++ b/cmd/juju/charmhub/data.go @@ -4,7 +4,7 @@ package charmhub import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" ) const ( diff --git a/cmd/juju/charmhub/download.go b/cmd/juju/charmhub/download.go index c6723227cabd..d3da4b95a6ad 100644 --- a/cmd/juju/charmhub/download.go +++ b/cmd/juju/charmhub/download.go @@ -13,7 +13,7 @@ import ( "strings" "syscall" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/gnuflag" diff --git a/cmd/juju/charmhub/info.go b/cmd/juju/charmhub/info.go index a88abc051c0d..65e3670b8534 100644 --- a/cmd/juju/charmhub/info.go +++ b/cmd/juju/charmhub/info.go @@ -8,7 +8,7 @@ import ( "fmt" "io" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/gnuflag" diff --git a/cmd/juju/charmhub/infowriter.go b/cmd/juju/charmhub/infowriter.go index ccc49e3ae19c..d5f1fa461646 100644 --- a/cmd/juju/charmhub/infowriter.go +++ b/cmd/juju/charmhub/infowriter.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "gopkg.in/yaml.v2" diff --git a/cmd/juju/charmhub/infowriter_test.go b/cmd/juju/charmhub/infowriter_test.go index 0bebfb166ff8..494664774f44 100644 --- a/cmd/juju/charmhub/infowriter_test.go +++ b/cmd/juju/charmhub/infowriter_test.go @@ -6,7 +6,7 @@ package charmhub import ( "bytes" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/cmd/juju/commands/bootstrap.go b/cmd/juju/commands/bootstrap.go index de9d60186e8c..f76f247f9145 100644 --- a/cmd/juju/commands/bootstrap.go +++ b/cmd/juju/commands/bootstrap.go @@ -12,7 +12,7 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jujuclock "github.com/juju/clock" "github.com/juju/cmd/v3" "github.com/juju/errors" diff --git a/cmd/juju/commands/helptool.go b/cmd/juju/commands/helptool.go index c0acadb9b280..66ffe9b45825 100644 --- a/cmd/juju/commands/helptool.go +++ b/cmd/juju/commands/helptool.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/gnuflag" diff --git a/cmd/juju/crossmodel/find_test.go b/cmd/juju/crossmodel/find_test.go index b73e6a8815ed..b63f887097dd 100644 --- a/cmd/juju/crossmodel/find_test.go +++ b/cmd/juju/crossmodel/find_test.go @@ -6,7 +6,7 @@ package crossmodel import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/errors" diff --git a/cmd/juju/crossmodel/list.go b/cmd/juju/crossmodel/list.go index 25b366e3909e..4934b35e07b2 100644 --- a/cmd/juju/crossmodel/list.go +++ b/cmd/juju/crossmodel/list.go @@ -8,7 +8,7 @@ import ( "regexp" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/gnuflag" diff --git a/cmd/juju/crossmodel/list_test.go b/cmd/juju/crossmodel/list_test.go index ce498fd8d289..d96d0bfec7c8 100644 --- a/cmd/juju/crossmodel/list_test.go +++ b/cmd/juju/crossmodel/list_test.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/errors" diff --git a/cmd/juju/crossmodel/remoteendpoints.go b/cmd/juju/crossmodel/remoteendpoints.go index 385e8fdcedf9..74340409d2c6 100644 --- a/cmd/juju/crossmodel/remoteendpoints.go +++ b/cmd/juju/crossmodel/remoteendpoints.go @@ -4,7 +4,7 @@ package crossmodel import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/juju/api/client/applicationoffers" "github.com/juju/juju/cmd/modelcmd" diff --git a/cmd/juju/crossmodel/show_test.go b/cmd/juju/crossmodel/show_test.go index 48e653ba061a..10004a94f4ef 100644 --- a/cmd/juju/crossmodel/show_test.go +++ b/cmd/juju/crossmodel/show_test.go @@ -6,7 +6,7 @@ package crossmodel import ( "os" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/errors" diff --git a/cmd/juju/metricsdebug/collectmetrics_test.go b/cmd/juju/metricsdebug/collectmetrics_test.go index ea8cf9e9b1b2..d97cbcb9548e 100644 --- a/cmd/juju/metricsdebug/collectmetrics_test.go +++ b/cmd/juju/metricsdebug/collectmetrics_test.go @@ -4,7 +4,7 @@ package metricsdebug_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/errors" "github.com/juju/testing" diff --git a/cmd/juju/payload/util_test.go b/cmd/juju/payload/util_test.go index 9d4e9326677c..d02a887e5b70 100644 --- a/cmd/juju/payload/util_test.go +++ b/cmd/juju/payload/util_test.go @@ -6,7 +6,7 @@ package payload import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/juju/core/payloads" ) diff --git a/cmd/juju/resource/charmresources.go b/cmd/juju/resource/charmresources.go index 4c7e497ec31f..00d50b2b25ca 100644 --- a/cmd/juju/resource/charmresources.go +++ b/cmd/juju/resource/charmresources.go @@ -4,8 +4,8 @@ package resource import ( - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/gnuflag" diff --git a/cmd/juju/resource/charmresources_test.go b/cmd/juju/resource/charmresources_test.go index fdfc9b6e0c55..96565a79e0e2 100644 --- a/cmd/juju/resource/charmresources_test.go +++ b/cmd/juju/resource/charmresources_test.go @@ -6,8 +6,8 @@ package resource_test import ( "strings" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" jujucmd "github.com/juju/cmd/v3" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/cmd/juju/resource/deploy.go b/cmd/juju/resource/deploy.go index 03b6860b4c3a..8379e79c863d 100644 --- a/cmd/juju/resource/deploy.go +++ b/cmd/juju/resource/deploy.go @@ -12,7 +12,7 @@ import ( "os" "strings" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "gopkg.in/yaml.v2" diff --git a/cmd/juju/resource/deploy_test.go b/cmd/juju/resource/deploy_test.go index bcd9a08dd8bc..ec36b059e32a 100644 --- a/cmd/juju/resource/deploy_test.go +++ b/cmd/juju/resource/deploy_test.go @@ -10,8 +10,8 @@ import ( "path" "strings" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/cmd/juju/resource/formatter.go b/cmd/juju/resource/formatter.go index e6cf6c6252bc..0ec0a4df7262 100644 --- a/cmd/juju/resource/formatter.go +++ b/cmd/juju/resource/formatter.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/cmd/juju/resource/formatter_test.go b/cmd/juju/resource/formatter_test.go index f70751268c84..cdaff475e5e1 100644 --- a/cmd/juju/resource/formatter_test.go +++ b/cmd/juju/resource/formatter_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/names/v4" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/cmd/juju/resource/list_test.go b/cmd/juju/resource/list_test.go index 2c3e481406c8..59e71ee9778f 100644 --- a/cmd/juju/resource/list_test.go +++ b/cmd/juju/resource/list_test.go @@ -6,7 +6,7 @@ package resource_test import ( "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" jujucmd "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/cmd/juju/resource/output_tabular_test.go b/cmd/juju/resource/output_tabular_test.go index 4daf966240f0..bd314d484387 100644 --- a/cmd/juju/resource/output_tabular_test.go +++ b/cmd/juju/resource/output_tabular_test.go @@ -7,7 +7,7 @@ import ( "bytes" "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/cmd/juju/resource/resource.go b/cmd/juju/resource/resource.go index e6f7e5e11259..bb2671acd760 100644 --- a/cmd/juju/resource/resource.go +++ b/cmd/juju/resource/resource.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11/resource" "github.com/juju/errors" ) diff --git a/cmd/juju/resource/stub_test.go b/cmd/juju/resource/stub_test.go index 4ac6714c6057..7b13456dddec 100644 --- a/cmd/juju/resource/stub_test.go +++ b/cmd/juju/resource/stub_test.go @@ -6,7 +6,7 @@ package resource_test import ( "io" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/testing" diff --git a/cmd/juju/resource/upload.go b/cmd/juju/resource/upload.go index 19ac7e4fb6c0..fa9afc348834 100644 --- a/cmd/juju/resource/upload.go +++ b/cmd/juju/resource/upload.go @@ -6,7 +6,7 @@ package resource import ( "io" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/cmd/juju/resource/upload_test.go b/cmd/juju/resource/upload_test.go index 96633ed7c68b..4601ac4178e2 100644 --- a/cmd/juju/resource/upload_test.go +++ b/cmd/juju/resource/upload_test.go @@ -6,7 +6,7 @@ package resource_test import ( "bytes" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" jujucmd "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/testing" diff --git a/cmd/juju/resource/util_test.go b/cmd/juju/resource/util_test.go index aa6666f56598..e5c09097795f 100644 --- a/cmd/juju/resource/util_test.go +++ b/cmd/juju/resource/util_test.go @@ -7,7 +7,7 @@ import ( "bytes" "strings" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" jujucmd "github.com/juju/cmd/v3" "github.com/juju/cmd/v3/cmdtesting" jc "github.com/juju/testing/checkers" diff --git a/cmd/juju/ssh/debughooks.go b/cmd/juju/ssh/debughooks.go index 1e394a1b045e..39a0dd4231d1 100644 --- a/cmd/juju/ssh/debughooks.go +++ b/cmd/juju/ssh/debughooks.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/cmd/v3" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/cmd/juju/ssh/ssh_container.go b/cmd/juju/ssh/ssh_container.go index 077cb5e9d4a8..a6a4428b29da 100644 --- a/cmd/juju/ssh/ssh_container.go +++ b/cmd/juju/ssh/ssh_container.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/gnuflag" "github.com/juju/names/v4" diff --git a/cmd/juju/ssh/ssh_container_test.go b/cmd/juju/ssh/ssh_container_test.go index b2b93c9c3dab..4318d04397d0 100644 --- a/cmd/juju/ssh/ssh_container_test.go +++ b/cmd/juju/ssh/ssh_container_test.go @@ -8,7 +8,7 @@ import ( "os" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/cmd/juju/status/formatter.go b/cmd/juju/status/formatter.go index 9705c34a496c..8865deecfb48 100644 --- a/cmd/juju/status/formatter.go +++ b/cmd/juju/status/formatter.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/names/v4" "github.com/juju/naturalsort" diff --git a/cmd/juju/status/output_tabular.go b/cmd/juju/status/output_tabular.go index 263d1610a654..365dd1d1451b 100644 --- a/cmd/juju/status/output_tabular.go +++ b/cmd/juju/status/output_tabular.go @@ -13,8 +13,8 @@ import ( "github.com/docker/distribution/reference" "github.com/juju/ansiterm" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/naturalsort" "github.com/juju/version/v2" diff --git a/cmd/juju/status/status_internal_test.go b/cmd/juju/status/status_internal_test.go index 9ffef9697a11..a7d0d8853f70 100644 --- a/cmd/juju/status/status_internal_test.go +++ b/cmd/juju/status/status_internal_test.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/names/v4" diff --git a/cmd/jujud/agent/bootstrap_test.go b/cmd/jujud/agent/bootstrap_test.go index 8f1b2287b47b..e751ef3869b7 100644 --- a/cmd/jujud/agent/bootstrap_test.go +++ b/cmd/jujud/agent/bootstrap_test.go @@ -13,7 +13,7 @@ import ( "path/filepath" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/cmd/v3" "github.com/juju/cmd/v3/cmdtesting" diff --git a/cmd/jujud/agent/controllercharm.go b/cmd/jujud/agent/controllercharm.go index 81615d9965c8..0bcf8c000f6f 100644 --- a/cmd/jujud/agent/controllercharm.go +++ b/cmd/jujud/agent/controllercharm.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/schema" "gopkg.in/juju/environschema.v1" diff --git a/container/broker/lxd-broker_test.go b/container/broker/lxd-broker_test.go index 44bb55b79c9a..45015979ac8f 100644 --- a/container/broker/lxd-broker_test.go +++ b/container/broker/lxd-broker_test.go @@ -6,7 +6,7 @@ package broker_test import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/core/actions/actions.go b/core/actions/actions.go index 8c0d14c760b4..cded5d2a13da 100644 --- a/core/actions/actions.go +++ b/core/actions/actions.go @@ -7,7 +7,7 @@ package actions import ( "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" ) // JujuExecActionName defines the action name used by juju-exec. diff --git a/core/assumes/featureset.go b/core/assumes/featureset.go index 3724ab3b6caf..8d6593a4951a 100644 --- a/core/assumes/featureset.go +++ b/core/assumes/featureset.go @@ -4,7 +4,7 @@ package assumes import ( - chassumes "github.com/juju/charm/v10/assumes" + chassumes "github.com/juju/charm/v11/assumes" "github.com/juju/collections/set" "github.com/juju/version/v2" ) diff --git a/core/assumes/sat_checker.go b/core/assumes/sat_checker.go index d3ee36332069..d028c1fe1fbe 100644 --- a/core/assumes/sat_checker.go +++ b/core/assumes/sat_checker.go @@ -4,7 +4,7 @@ package assumes import ( - chassumes "github.com/juju/charm/v10/assumes" + chassumes "github.com/juju/charm/v11/assumes" "github.com/juju/errors" ) diff --git a/core/assumes/sat_checker_test.go b/core/assumes/sat_checker_test.go index a11777c6e50a..45d3564be7fa 100644 --- a/core/assumes/sat_checker_test.go +++ b/core/assumes/sat_checker_test.go @@ -6,7 +6,7 @@ package assumes import ( "strings" - chassumes "github.com/juju/charm/v10/assumes" + chassumes "github.com/juju/charm/v11/assumes" "github.com/juju/testing" jc "github.com/juju/testing/checkers" "github.com/juju/version/v2" diff --git a/core/bundle/changes/changes.go b/core/bundle/changes/changes.go index 09655fdb75b4..a5038c51ab7b 100644 --- a/core/bundle/changes/changes.go +++ b/core/bundle/changes/changes.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/core/bundle/changes/changes_test.go b/core/bundle/changes/changes_test.go index 0b7a03c9d089..ffbece53167c 100644 --- a/core/bundle/changes/changes_test.go +++ b/core/bundle/changes/changes_test.go @@ -12,7 +12,7 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" jujutesting "github.com/juju/testing" diff --git a/core/bundle/changes/diff.go b/core/bundle/changes/diff.go index 6f414a6fa427..732aaa20dc18 100644 --- a/core/bundle/changes/diff.go +++ b/core/bundle/changes/diff.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/core/bundle/changes/diff_test.go b/core/bundle/changes/diff_test.go index b022c791fd84..3521f036ab44 100644 --- a/core/bundle/changes/diff_test.go +++ b/core/bundle/changes/diff_test.go @@ -6,7 +6,7 @@ package bundlechanges_test import ( "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/loggo" jujutesting "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/core/bundle/changes/handlers.go b/core/bundle/changes/handlers.go index e68189fa3ea7..6798b45e8e2b 100644 --- a/core/bundle/changes/handlers.go +++ b/core/bundle/changes/handlers.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/naturalsort" diff --git a/core/bundle/changes/handlers_test.go b/core/bundle/changes/handlers_test.go index 1088fab18733..bcb38142955a 100644 --- a/core/bundle/changes/handlers_test.go +++ b/core/bundle/changes/handlers_test.go @@ -4,7 +4,7 @@ package bundlechanges import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jujutesting "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/core/bundle/changes/model.go b/core/bundle/changes/model.go index 0e0766d8ed2f..3952e1353a0c 100644 --- a/core/bundle/changes/model.go +++ b/core/bundle/changes/model.go @@ -8,7 +8,7 @@ import ( "sort" "strconv" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/names/v4" "github.com/juju/naturalsort" diff --git a/core/bundle/changes/model_test.go b/core/bundle/changes/model_test.go index df79d832fe45..a1ed6f3dae6e 100644 --- a/core/bundle/changes/model_test.go +++ b/core/bundle/changes/model_test.go @@ -6,7 +6,7 @@ package bundlechanges import ( "bytes" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/loggo" "github.com/juju/naturalsort" "github.com/juju/testing" diff --git a/core/cache/unit.go b/core/cache/unit.go index 5f27a500af3b..7d63e32a7300 100644 --- a/core/cache/unit.go +++ b/core/cache/unit.go @@ -6,7 +6,7 @@ package cache import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/core/cache/unit_test.go b/core/cache/unit_test.go index ef7a93a13ceb..d35f829a2059 100644 --- a/core/cache/unit_test.go +++ b/core/cache/unit_test.go @@ -4,7 +4,7 @@ package cache_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" "github.com/juju/worker/v3/workertest" gc "gopkg.in/check.v1" diff --git a/core/charm/channel.go b/core/charm/channel.go index 823682a9201e..7aa3befe670b 100644 --- a/core/charm/channel.go +++ b/core/charm/channel.go @@ -4,7 +4,7 @@ package charm import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" ) const ( diff --git a/core/charm/channel_test.go b/core/charm/channel_test.go index ca0f314e935b..3c0746a1737b 100644 --- a/core/charm/channel_test.go +++ b/core/charm/channel_test.go @@ -4,7 +4,7 @@ package charm_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/testing" gc "gopkg.in/check.v1" diff --git a/core/charm/charm_mock_test.go b/core/charm/charm_mock_test.go index 8c852bd4e924..09f8dfef7b77 100644 --- a/core/charm/charm_mock_test.go +++ b/core/charm/charm_mock_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/juju/charm/v10 (interfaces: CharmMeta) +// Source: github.com/juju/charm/v11 (interfaces: CharmMeta) // Package charm is a generated GoMock package. package charm @@ -7,7 +7,7 @@ package charm import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" gomock "go.uber.org/mock/gomock" ) diff --git a/core/charm/charmpath.go b/core/charm/charmpath.go index 0e3561cc4c4a..914734de756e 100644 --- a/core/charm/charmpath.go +++ b/core/charm/charmpath.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" ) diff --git a/core/charm/charmpath_test.go b/core/charm/charmpath_test.go index 2307e3293f41..250bda413fbf 100644 --- a/core/charm/charmpath_test.go +++ b/core/charm/charmpath_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/core/charm/computedseries.go b/core/charm/computedseries.go index 8dfbd1f93217..10f05991f878 100644 --- a/core/charm/computedseries.go +++ b/core/charm/computedseries.go @@ -6,7 +6,7 @@ package charm import ( "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/core/charm/computedseries_test.go b/core/charm/computedseries_test.go index 0742a15ba65d..db07eeb5de42 100644 --- a/core/charm/computedseries_test.go +++ b/core/charm/computedseries_test.go @@ -4,8 +4,8 @@ package charm import ( - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/core/charm/downloader/downloader.go b/core/charm/downloader/downloader.go index ab35067653d0..ed087c40719b 100644 --- a/core/charm/downloader/downloader.go +++ b/core/charm/downloader/downloader.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/utils/v3" diff --git a/core/charm/downloader/downloader_test.go b/core/charm/downloader/downloader_test.go index 3e2210fc738e..aae9e69eb0ec 100644 --- a/core/charm/downloader/downloader_test.go +++ b/core/charm/downloader/downloader_test.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/testing" jc "github.com/juju/testing/checkers" "github.com/juju/version/v2" diff --git a/core/charm/downloader/export_test.go b/core/charm/downloader/export_test.go index 3de82a40a8af..800f6fd705d8 100644 --- a/core/charm/downloader/export_test.go +++ b/core/charm/downloader/export_test.go @@ -4,7 +4,7 @@ package downloader import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" corecharm "github.com/juju/juju/core/charm" ) diff --git a/core/charm/downloader/mocks/downloader_mocks.go b/core/charm/downloader/mocks/downloader_mocks.go index ed99604d5088..cc09818163c3 100644 --- a/core/charm/downloader/mocks/downloader_mocks.go +++ b/core/charm/downloader/mocks/downloader_mocks.go @@ -8,7 +8,7 @@ import ( url "net/url" reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" charm0 "github.com/juju/juju/core/charm" downloader "github.com/juju/juju/core/charm/downloader" gomock "go.uber.org/mock/gomock" diff --git a/core/charm/format.go b/core/charm/format.go index eb59f655319a..f3fe9ccc322f 100644 --- a/core/charm/format.go +++ b/core/charm/format.go @@ -3,7 +3,7 @@ package charm -import "github.com/juju/charm/v10" +import "github.com/juju/charm/v11" // MetadataFormat of the parsed charm. type MetadataFormat int diff --git a/core/charm/format_test.go b/core/charm/format_test.go index 08864b458529..4f062f872462 100644 --- a/core/charm/format_test.go +++ b/core/charm/format_test.go @@ -4,7 +4,7 @@ package charm import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/testing" "go.uber.org/mock/gomock" gc "gopkg.in/check.v1" diff --git a/core/charm/kubernetes.go b/core/charm/kubernetes.go index a13b4628a6f1..1bee7f5189a1 100644 --- a/core/charm/kubernetes.go +++ b/core/charm/kubernetes.go @@ -4,7 +4,7 @@ package charm import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" corebase "github.com/juju/juju/core/base" diff --git a/core/charm/kubernetes_test.go b/core/charm/kubernetes_test.go index 2bdc403ac745..a64d56d6395d 100644 --- a/core/charm/kubernetes_test.go +++ b/core/charm/kubernetes_test.go @@ -4,8 +4,8 @@ package charm import ( - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/testing" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/core/charm/origin.go b/core/charm/origin.go index 1ea735fe9596..ba29b070b26f 100644 --- a/core/charm/origin.go +++ b/core/charm/origin.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" corebase "github.com/juju/juju/core/base" diff --git a/core/charm/package_test.go b/core/charm/package_test.go index 7865cc40e9aa..1c0fffae20ac 100644 --- a/core/charm/package_test.go +++ b/core/charm/package_test.go @@ -9,7 +9,7 @@ import ( gc "gopkg.in/check.v1" ) -//go:generate go run go.uber.org/mock/mockgen -package charm -destination charm_mock_test.go github.com/juju/charm/v10 CharmMeta +//go:generate go run go.uber.org/mock/mockgen -package charm -destination charm_mock_test.go github.com/juju/charm/v11 CharmMeta func TestPackage(t *testing.T) { gc.TestingT(t) diff --git a/core/charm/repository.go b/core/charm/repository.go index 9b30bddf3574..338571aa967f 100644 --- a/core/charm/repository.go +++ b/core/charm/repository.go @@ -6,8 +6,8 @@ package charm import ( "net/url" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" ) // Repository describes an API for querying charm/bundle information and diff --git a/core/charm/repository/charmhub.go b/core/charm/repository/charmhub.go index 863bc16f3b7b..8da6083a92cf 100644 --- a/core/charm/repository/charmhub.go +++ b/core/charm/repository/charmhub.go @@ -9,8 +9,8 @@ import ( "net/url" "strings" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/core/charm/repository/charmhub_test.go b/core/charm/repository/charmhub_test.go index 42aedf9c7b28..25d61415a561 100644 --- a/core/charm/repository/charmhub_test.go +++ b/core/charm/repository/charmhub_test.go @@ -8,7 +8,7 @@ import ( "fmt" "net/url" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/testing" diff --git a/core/charm/repository/mocks/charmhub_client_mock.go b/core/charm/repository/mocks/charmhub_client_mock.go index 127e8346c185..3e26b6bda0a0 100644 --- a/core/charm/repository/mocks/charmhub_client_mock.go +++ b/core/charm/repository/mocks/charmhub_client_mock.go @@ -9,7 +9,7 @@ import ( url "net/url" reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" charmhub "github.com/juju/juju/charmhub" transport "github.com/juju/juju/charmhub/transport" gomock "go.uber.org/mock/gomock" diff --git a/core/crossmodel/interface.go b/core/crossmodel/interface.go index 7841a0d9fb86..21aa5210bdf0 100644 --- a/core/crossmodel/interface.go +++ b/core/crossmodel/interface.go @@ -4,7 +4,7 @@ package crossmodel import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "gopkg.in/macaroon.v2" "github.com/juju/juju/rpc/params" diff --git a/core/crossmodel/params.go b/core/crossmodel/params.go index 97e3818bd51f..ca854ab52b68 100644 --- a/core/crossmodel/params.go +++ b/core/crossmodel/params.go @@ -6,7 +6,7 @@ package crossmodel import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/juju/core/permission" "github.com/juju/juju/core/relation" diff --git a/core/model/charm_mock_test.go b/core/model/charm_mock_test.go index 4ef4aa339a11..9a4e9dd14f9f 100644 --- a/core/model/charm_mock_test.go +++ b/core/model/charm_mock_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/juju/charm/v10 (interfaces: CharmMeta) +// Source: github.com/juju/charm/v11 (interfaces: CharmMeta) // Package model_test is a generated GoMock package. package model_test @@ -7,7 +7,7 @@ package model_test import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" gomock "go.uber.org/mock/gomock" ) diff --git a/core/model/package_test.go b/core/model/package_test.go index 7590dc961d49..4c3e97aa2107 100644 --- a/core/model/package_test.go +++ b/core/model/package_test.go @@ -9,7 +9,7 @@ import ( gc "gopkg.in/check.v1" ) -//go:generate go run go.uber.org/mock/mockgen -package model_test -destination charm_mock_test.go github.com/juju/charm/v10 CharmMeta +//go:generate go run go.uber.org/mock/mockgen -package model_test -destination charm_mock_test.go github.com/juju/charm/v11 CharmMeta func TestPackage(t *testing.T) { gc.TestingT(t) diff --git a/core/payloads/filter_test.go b/core/payloads/filter_test.go index 51aa25838b30..51ac59b6abe3 100644 --- a/core/payloads/filter_test.go +++ b/core/payloads/filter_test.go @@ -4,7 +4,7 @@ package payloads_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/core/payloads/payload.go b/core/payloads/payload.go index acce722b072f..22fc204654d7 100644 --- a/core/payloads/payload.go +++ b/core/payloads/payload.go @@ -4,7 +4,7 @@ package payloads import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" ) diff --git a/core/payloads/payload_test.go b/core/payloads/payload_test.go index 6b4efe979019..c222d2f0a529 100644 --- a/core/payloads/payload_test.go +++ b/core/payloads/payload_test.go @@ -4,7 +4,7 @@ package payloads_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/core/resources/application.go b/core/resources/application.go index a50421d89efd..fac45cfd83f5 100644 --- a/core/resources/application.go +++ b/core/resources/application.go @@ -4,7 +4,7 @@ package resources import ( - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" ) diff --git a/core/resources/application_test.go b/core/resources/application_test.go index 513f50d32d05..d8932d7c4b30 100644 --- a/core/resources/application_test.go +++ b/core/resources/application_test.go @@ -4,7 +4,7 @@ package resources_test import ( - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/core/resources/content.go b/core/resources/content.go index c33a580907b5..281f37c4ad64 100644 --- a/core/resources/content.go +++ b/core/resources/content.go @@ -9,7 +9,7 @@ import ( "io" "os" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/utils/v3" ) diff --git a/core/resources/resource.go b/core/resources/resource.go index 5efffc1d593a..d0fcb8f68d96 100644 --- a/core/resources/resource.go +++ b/core/resources/resource.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11/resource" "github.com/juju/errors" ) diff --git a/core/resources/resource_test.go b/core/resources/resource_test.go index 679299151e0b..623331a3b819 100644 --- a/core/resources/resource_test.go +++ b/core/resources/resource_test.go @@ -6,7 +6,7 @@ package resources_test import ( "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/core/resources/serialization.go b/core/resources/serialization.go index a5092865e960..095a61c891c9 100644 --- a/core/resources/serialization.go +++ b/core/resources/serialization.go @@ -4,7 +4,7 @@ package resources import ( - "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11/resource" "github.com/juju/errors" ) diff --git a/core/resources/serialization_test.go b/core/resources/serialization_test.go index 688236e62c71..3288dbd29fab 100644 --- a/core/resources/serialization_test.go +++ b/core/resources/serialization_test.go @@ -6,7 +6,7 @@ package resources_test import ( "strings" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/core/resources/testing/resource.go b/core/resources/testing/resource.go index e3830965627b..ac1c6f4c8d4d 100644 --- a/core/resources/testing/resource.go +++ b/core/resources/testing/resource.go @@ -8,7 +8,7 @@ import ( "strings" "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/testing" jc "github.com/juju/testing/checkers" "github.com/juju/testing/filetesting" diff --git a/core/resources/util_test.go b/core/resources/util_test.go index 569a4278d970..93b743816886 100644 --- a/core/resources/util_test.go +++ b/core/resources/util_test.go @@ -6,7 +6,7 @@ package resources_test import ( "strings" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" ) diff --git a/core/settings/settings.go b/core/settings/settings.go index c3eeb4a2d681..7267288edb90 100644 --- a/core/settings/settings.go +++ b/core/settings/settings.go @@ -6,7 +6,7 @@ package settings import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" ) diff --git a/environs/bootstrap/bootstrap.go b/environs/bootstrap/bootstrap.go index e7ff337c471b..bba14c780ab3 100644 --- a/environs/bootstrap/bootstrap.go +++ b/environs/bootstrap/bootstrap.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/environs/bootstrap/bootstrap_test.go b/environs/bootstrap/bootstrap_test.go index d515753eace6..347e6de50d10 100644 --- a/environs/bootstrap/bootstrap_test.go +++ b/environs/bootstrap/bootstrap_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/errors" osseries "github.com/juju/os/v2/series" diff --git a/environs/jujutest/livetests.go b/environs/jujutest/livetests.go index 7b7fae7770ce..b68b0c7dda03 100644 --- a/environs/jujutest/livetests.go +++ b/environs/jujutest/livetests.go @@ -9,7 +9,7 @@ import ( "path/filepath" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" gitjujutesting "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/go.mod b/go.mod index c4fc0fc40923..196a998275e7 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/im7mortal/kmutex v1.0.1 github.com/juju/ansiterm v1.0.0 github.com/juju/blobstore/v3 v3.0.2 - github.com/juju/charm/v10 v10.0.1 + github.com/juju/charm/v11 v11.0.2 github.com/juju/clock v1.0.3 github.com/juju/cmd/v3 v3.0.13 github.com/juju/collections v1.0.4 diff --git a/go.sum b/go.sum index 618acc9e0468..779817222771 100644 --- a/go.sum +++ b/go.sum @@ -747,8 +747,8 @@ github.com/juju/ansiterm v1.0.0 h1:gmMvnZRq7JZJx6jkfSq9/+2LMrVEwGwt7UR6G+lmDEg= github.com/juju/ansiterm v1.0.0/go.mod h1:PyXUpnI3olx3bsPcHt98FGPX/KCFZ1Fi+hw1XLI6384= github.com/juju/blobstore/v3 v3.0.2 h1:roZ4YBuZYmWId6y/6ZLQSAMmNlHOclHD8PQAMOQer6E= github.com/juju/blobstore/v3 v3.0.2/go.mod h1:NXEgMhrVH5744/zLfSkzsySlDQUpCgzvcNxjJJhICko= -github.com/juju/charm/v10 v10.0.1 h1:CFERNorDM0r7HZaEs3JugMPAogOnKX4GAC+w6Kler/o= -github.com/juju/charm/v10 v10.0.1/go.mod h1:j5sA8vbcxXDaRpncl08MeCK1tgD7mMtoPRewHE01+qc= +github.com/juju/charm/v11 v11.0.2 h1:qVcrG9X5fTN++aBfM4QwzOQRd6h31degr3vD2fTgjxs= +github.com/juju/charm/v11 v11.0.2/go.mod h1:Mge5Ko3pPgocmk4v1pQgmBhF8BuBLGTCFu3jq83JvHk= github.com/juju/clock v0.0.0-20190205081909-9c5c9712527c/go.mod h1:nD0vlnrUjcjJhqN5WuCWZyzfd5AHZAC9/ajvbSx69xA= github.com/juju/clock v0.0.0-20220202072423-1b0f830854c4/go.mod h1:zDZCPSgCJQINeZtQwHx2/cFk4seaBC8Yiqe8V82xiP0= github.com/juju/clock v0.0.0-20220203021603-d9deb868a28a/go.mod h1:GZ/FY8Cqw3KHG6DwRVPUKbSPTAwyrU28xFi5cqZnLsc= diff --git a/juju/testing/conn.go b/juju/testing/conn.go index e4c2cb038429..49044a8932b5 100644 --- a/juju/testing/conn.go +++ b/juju/testing/conn.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/juju/testing/repo.go b/juju/testing/repo.go index 9eef5589849e..9e0b5f083c26 100644 --- a/juju/testing/repo.go +++ b/juju/testing/repo.go @@ -6,7 +6,7 @@ package testing import ( "sort" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" "github.com/juju/utils/v3" diff --git a/migration/migration.go b/migration/migration.go index b6cd17e31c41..e82da6e1208f 100644 --- a/migration/migration.go +++ b/migration/migration.go @@ -9,7 +9,7 @@ import ( "os" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/description/v4" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/migration/migration_test.go b/migration/migration_test.go index 6c3d92524317..5bf27c8ac3a4 100644 --- a/migration/migration_test.go +++ b/migration/migration_test.go @@ -10,7 +10,7 @@ import ( "net/url" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/description/v4" "github.com/juju/errors" "github.com/juju/testing" diff --git a/resource/charmhub.go b/resource/charmhub.go index 8e793865270a..d28e97a7d6d9 100644 --- a/resource/charmhub.go +++ b/resource/charmhub.go @@ -7,7 +7,7 @@ import ( "context" "net/url" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/kr/pretty" diff --git a/resource/charmhub_test.go b/resource/charmhub_test.go index d3ad2e6ef921..a0240993c544 100644 --- a/resource/charmhub_test.go +++ b/resource/charmhub_test.go @@ -7,8 +7,8 @@ import ( "bytes" "io" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" gc "gopkg.in/check.v1" diff --git a/resource/export_test.go b/resource/export_test.go index 9810c7991cb6..eacc5cb117cb 100644 --- a/resource/export_test.go +++ b/resource/export_test.go @@ -6,7 +6,7 @@ package resource import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/juju/state" diff --git a/resource/interfaces.go b/resource/interfaces.go index f94b4cb4f065..72f0d82f0ae4 100644 --- a/resource/interfaces.go +++ b/resource/interfaces.go @@ -8,7 +8,7 @@ import ( "io" "net/url" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/juju/charmhub" "github.com/juju/juju/charmhub/transport" diff --git a/resource/mocks/cache_mock.go b/resource/mocks/cache_mock.go index da9933a36e51..d7b24e19085b 100644 --- a/resource/mocks/cache_mock.go +++ b/resource/mocks/cache_mock.go @@ -8,7 +8,7 @@ import ( io "io" reflect "reflect" - resource "github.com/juju/charm/v10/resource" + resource "github.com/juju/charm/v11/resource" resources "github.com/juju/juju/core/resources" state "github.com/juju/juju/state" gomock "go.uber.org/mock/gomock" diff --git a/resource/opener.go b/resource/opener.go index 84c7fab2ac0b..03b99e7fa78b 100644 --- a/resource/opener.go +++ b/resource/opener.go @@ -8,8 +8,8 @@ import ( "io" "github.com/im7mortal/kmutex" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/resource/opener_test.go b/resource/opener_test.go index 8c73bb5475d1..ef8d78541cbb 100644 --- a/resource/opener_test.go +++ b/resource/opener_test.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/resource/resource.go b/resource/resource.go index 284f96c7ec38..b18d07c15826 100644 --- a/resource/resource.go +++ b/resource/resource.go @@ -6,7 +6,7 @@ package resource import ( "io" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/loggo" ) diff --git a/resource/retryclient.go b/resource/retryclient.go index 8e0b22a8d6a6..e891ee81d146 100644 --- a/resource/retryclient.go +++ b/resource/retryclient.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/errors" "github.com/juju/retry" diff --git a/rpc/params/charms.go b/rpc/params/charms.go index 83273b4f2211..2aa9ce91cb11 100644 --- a/rpc/params/charms.go +++ b/rpc/params/charms.go @@ -4,8 +4,8 @@ package params import ( - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/assumes" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/assumes" ) // ApplicationCharmResults contains a set of ApplicationCharmResults. diff --git a/rpc/params/crossmodel.go b/rpc/params/crossmodel.go index d6689beb8e52..43f87296b9e5 100644 --- a/rpc/params/crossmodel.go +++ b/rpc/params/crossmodel.go @@ -5,7 +5,7 @@ package params import ( "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/kr/pretty" "gopkg.in/macaroon.v2" diff --git a/rpc/params/multiwatcher.go b/rpc/params/multiwatcher.go index d8b1a1c74da7..656470f65022 100644 --- a/rpc/params/multiwatcher.go +++ b/rpc/params/multiwatcher.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/juju/core/constraints" diff --git a/rpc/params/params_test.go b/rpc/params/params_test.go index a327dea1733c..003ba5005823 100644 --- a/rpc/params/params_test.go +++ b/rpc/params/params_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" stdtesting "testing" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/state/action_test.go b/state/action_test.go index 579bbfaec79e..65048fead766 100644 --- a/state/action_test.go +++ b/state/action_test.go @@ -12,7 +12,7 @@ import ( "sync/atomic" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock/testclock" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/state/allwatcher.go b/state/allwatcher.go index 3669e5884d86..2cc093157f8a 100644 --- a/state/allwatcher.go +++ b/state/allwatcher.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/mgo/v3" "github.com/juju/mgo/v3/bson" diff --git a/state/allwatcher_internal_test.go b/state/allwatcher_internal_test.go index 325ae66bbe90..d6c47777b98d 100644 --- a/state/allwatcher_internal_test.go +++ b/state/allwatcher_internal_test.go @@ -8,7 +8,7 @@ import ( "sort" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/state/application.go b/state/application.go index f26882e5c758..1660d8659fc5 100644 --- a/state/application.go +++ b/state/application.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/mgo/v3" diff --git a/state/application_test.go b/state/application_test.go index be4a1a9281b7..c8a102127f55 100644 --- a/state/application_test.go +++ b/state/application_test.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/state/applicationoffers.go b/state/applicationoffers.go index 2a4dd2ab31f1..5eced2a75d4a 100644 --- a/state/applicationoffers.go +++ b/state/applicationoffers.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/mgo/v3" diff --git a/state/applicationoffers_test.go b/state/applicationoffers_test.go index fe1c8df3bed5..6d58209d57ef 100644 --- a/state/applicationoffers_test.go +++ b/state/applicationoffers_test.go @@ -4,7 +4,7 @@ package state_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/state/applicationofferuser_test.go b/state/applicationofferuser_test.go index 0aa73b552b9a..fac4256675af 100644 --- a/state/applicationofferuser_test.go +++ b/state/applicationofferuser_test.go @@ -4,7 +4,7 @@ package state_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/state/bench_test.go b/state/bench_test.go index a3348b12e934..fa1e0f43af2d 100644 --- a/state/bench_test.go +++ b/state/bench_test.go @@ -6,7 +6,7 @@ package state_test import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" "github.com/juju/utils/v3" gc "gopkg.in/check.v1" diff --git a/state/charm.go b/state/charm.go index f280077e5b7f..a72136ae0e97 100644 --- a/state/charm.go +++ b/state/charm.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/mgo/v3" diff --git a/state/charm_test.go b/state/charm_test.go index 781b251394a2..070f69245d09 100644 --- a/state/charm_test.go +++ b/state/charm_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/mgo/v3" jc "github.com/juju/testing/checkers" diff --git a/state/cleanup.go b/state/cleanup.go index 681fcb6be2ec..f9552e590218 100644 --- a/state/cleanup.go +++ b/state/cleanup.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/mgo/v3/bson" "github.com/juju/mgo/v3/txn" diff --git a/state/cleanup_test.go b/state/cleanup_test.go index 55bf25745a87..76ee3835178d 100644 --- a/state/cleanup_test.go +++ b/state/cleanup_test.go @@ -9,7 +9,7 @@ import ( "strconv" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/state/devices.go b/state/devices.go index d63d170e7d69..a646663d781b 100644 --- a/state/devices.go +++ b/state/devices.go @@ -4,7 +4,7 @@ package state import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/mgo/v3" "github.com/juju/mgo/v3/txn" diff --git a/state/endpoint.go b/state/endpoint.go index 0d9d40b541da..d1768098d270 100644 --- a/state/endpoint.go +++ b/state/endpoint.go @@ -6,7 +6,7 @@ package state import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" ) // counterpartRole returns the RelationRole that this RelationRole diff --git a/state/endpoint_bindings.go b/state/endpoint_bindings.go index 2cc722562f9f..7fa3763b0c53 100644 --- a/state/endpoint_bindings.go +++ b/state/endpoint_bindings.go @@ -6,7 +6,7 @@ package state import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/mgo/v3" diff --git a/state/endpoint_bindings_test.go b/state/endpoint_bindings_test.go index 72f129a39967..d4a4ad6fbf40 100644 --- a/state/endpoint_bindings_test.go +++ b/state/endpoint_bindings_test.go @@ -4,7 +4,7 @@ package state_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/state/endpoint_test.go b/state/endpoint_test.go index a6bdb425ebd3..b709f6edf524 100644 --- a/state/endpoint_test.go +++ b/state/endpoint_test.go @@ -4,7 +4,7 @@ package state_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/state/errors/common.go b/state/errors/common.go index f7bd594a5b5a..cf310238c071 100644 --- a/state/errors/common.go +++ b/state/errors/common.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/version/v2" diff --git a/state/export_test.go b/state/export_test.go index ba51b0e32c04..fafc633fd28c 100644 --- a/state/export_test.go +++ b/state/export_test.go @@ -10,7 +10,7 @@ import ( "strconv" "time" // Only used for time types. - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/clock/testclock" "github.com/juju/description/v4" diff --git a/state/filesystem.go b/state/filesystem.go index ec555088f8e7..19ba447b1c71 100644 --- a/state/filesystem.go +++ b/state/filesystem.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/mgo/v3" "github.com/juju/mgo/v3/bson" diff --git a/state/filesystem_test.go b/state/filesystem_test.go index e86d4b1aa8bf..a704c299a6c7 100644 --- a/state/filesystem_test.go +++ b/state/filesystem_test.go @@ -4,7 +4,7 @@ package state_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/state/machine.go b/state/machine.go index 9aa03a53a1f3..cfa7c496fa80 100644 --- a/state/machine.go +++ b/state/machine.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/mgo/v3" diff --git a/state/metrics.go b/state/metrics.go index fbec71f7aea1..556cac1b34c9 100644 --- a/state/metrics.go +++ b/state/metrics.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/mgo/v3" diff --git a/state/migration_export.go b/state/migration_export.go index 4a16671179ee..61a7a2426c51 100644 --- a/state/migration_export.go +++ b/state/migration_export.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/description/v4" "github.com/juju/errors" diff --git a/state/migration_export_test.go b/state/migration_export_test.go index da86b699a4e7..710aece303c8 100644 --- a/state/migration_export_test.go +++ b/state/migration_export_test.go @@ -10,8 +10,8 @@ import ( "math/rand" "time" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/description/v4" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/state/migration_import.go b/state/migration_import.go index ccdc53e16707..b3fee01c895b 100644 --- a/state/migration_import.go +++ b/state/migration_import.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/collections/transform" "github.com/juju/description/v4" diff --git a/state/migration_import_test.go b/state/migration_import_test.go index a17d3d1bb4cf..a2d4d93cfe27 100644 --- a/state/migration_import_test.go +++ b/state/migration_import_test.go @@ -9,7 +9,7 @@ import ( "strconv" "time" // only uses time.Time values - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/description/v4" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/state/migration_internal_test.go b/state/migration_internal_test.go index 2845272afa95..00a6714c4a7f 100644 --- a/state/migration_internal_test.go +++ b/state/migration_internal_test.go @@ -4,7 +4,7 @@ package state import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" gc "gopkg.in/check.v1" diff --git a/state/migrations/remoteapplications.go b/state/migrations/remoteapplications.go index 580cbea1cc5b..7315546c7ebd 100644 --- a/state/migrations/remoteapplications.go +++ b/state/migrations/remoteapplications.go @@ -4,7 +4,7 @@ package migrations import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/description/v4" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/state/mocks/resources_mock.go b/state/mocks/resources_mock.go index c1e55dfa0850..68ecd231ea51 100644 --- a/state/mocks/resources_mock.go +++ b/state/mocks/resources_mock.go @@ -9,7 +9,7 @@ import ( reflect "reflect" time "time" - resource "github.com/juju/charm/v10/resource" + resource "github.com/juju/charm/v11/resource" resources "github.com/juju/juju/core/resources" state "github.com/juju/juju/state" gomock "go.uber.org/mock/gomock" diff --git a/state/model_test.go b/state/model_test.go index 21bcb0a8a8ba..1a27d00ef35a 100644 --- a/state/model_test.go +++ b/state/model_test.go @@ -8,7 +8,7 @@ import ( "sort" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/errors" "github.com/juju/mgo/v3/bson" diff --git a/state/modelgeneration.go b/state/modelgeneration.go index 106361427092..ba4a1266f216 100644 --- a/state/modelgeneration.go +++ b/state/modelgeneration.go @@ -9,7 +9,7 @@ import ( "strconv" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/mgo/v3" diff --git a/state/modelgeneration_test.go b/state/modelgeneration_test.go index f147685100c3..ad66f9da0fb5 100644 --- a/state/modelgeneration_test.go +++ b/state/modelgeneration_test.go @@ -6,7 +6,7 @@ package state_test import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock/testclock" "github.com/juju/errors" jc "github.com/juju/testing/checkers" diff --git a/state/payloads_ns.go b/state/payloads_ns.go index 7cde6c55d357..ed0778bb5886 100644 --- a/state/payloads_ns.go +++ b/state/payloads_ns.go @@ -6,7 +6,7 @@ package state import ( "fmt" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/mgo/v3/bson" "github.com/juju/mgo/v3/txn" diff --git a/state/payloads_test.go b/state/payloads_test.go index 8588547f9748..dfb2ce94bfe4 100644 --- a/state/payloads_test.go +++ b/state/payloads_test.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/state/podspec_ops.go b/state/podspec_ops.go index faa4702358b5..e6cf398a9de9 100644 --- a/state/podspec_ops.go +++ b/state/podspec_ops.go @@ -4,7 +4,7 @@ package state import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/mgo/v3/bson" "github.com/juju/mgo/v3/txn" diff --git a/state/relation.go b/state/relation.go index 7709d8d1892f..00518b60ce9b 100644 --- a/state/relation.go +++ b/state/relation.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/mgo/v3" "github.com/juju/mgo/v3/bson" diff --git a/state/relation_internal_test.go b/state/relation_internal_test.go index a4c2a71fad5f..9778754670c5 100644 --- a/state/relation_internal_test.go +++ b/state/relation_internal_test.go @@ -4,7 +4,7 @@ package state import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" ) diff --git a/state/relation_test.go b/state/relation_test.go index d2c0c7e1e3bb..9189793728aa 100644 --- a/state/relation_test.go +++ b/state/relation_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/state/relationunit.go b/state/relationunit.go index 80ac33d9d7f4..d8ab39005b88 100644 --- a/state/relationunit.go +++ b/state/relationunit.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/mgo/v3" diff --git a/state/relationunit_test.go b/state/relationunit_test.go index 74cfea2ab130..6023f2667596 100644 --- a/state/relationunit_test.go +++ b/state/relationunit_test.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/state/remoteapplication.go b/state/remoteapplication.go index 3d09a3820262..60a13b3765dc 100644 --- a/state/remoteapplication.go +++ b/state/remoteapplication.go @@ -9,7 +9,7 @@ import ( "sort" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/mgo/v3" diff --git a/state/remoteapplication_test.go b/state/remoteapplication_test.go index 7375b6207b59..87bd3b231418 100644 --- a/state/remoteapplication_test.go +++ b/state/remoteapplication_test.go @@ -7,7 +7,7 @@ import ( "sort" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/state/resources.go b/state/resources.go index bd7d7be7f973..eff8eb7b76cb 100644 --- a/state/resources.go +++ b/state/resources.go @@ -11,7 +11,7 @@ import ( "strings" "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/clock" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/state/resources_staged_test.go b/state/resources_staged_test.go index 1c8af73ad7e8..34f8b185dab4 100644 --- a/state/resources_staged_test.go +++ b/state/resources_staged_test.go @@ -8,7 +8,7 @@ import ( "crypto/sha512" "fmt" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/state/resources_test.go b/state/resources_test.go index 398ff1345b43..6a23325c0087 100644 --- a/state/resources_test.go +++ b/state/resources_test.go @@ -11,8 +11,8 @@ import ( "sort" "time" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/state/secrets_test.go b/state/secrets_test.go index aa5947b2f4f1..57d7f0836df9 100644 --- a/state/secrets_test.go +++ b/state/secrets_test.go @@ -8,7 +8,7 @@ import ( "sort" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/state/state.go b/state/state.go index ef605a2b5bf6..cc63aaf14dee 100644 --- a/state/state.go +++ b/state/state.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/state/state_test.go b/state/state_test.go index 24ccf22ddcde..a0c8e52b2a1d 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/clock/testclock" "github.com/juju/errors" diff --git a/state/storage.go b/state/storage.go index 09a3a9e9bdeb..3ee0db268434 100644 --- a/state/storage.go +++ b/state/storage.go @@ -9,7 +9,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/mgo/v3" diff --git a/state/storage_test.go b/state/storage_test.go index e69d5c4faf28..63ff1f7fcf78 100644 --- a/state/storage_test.go +++ b/state/storage_test.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/mgo/v3" diff --git a/state/unit.go b/state/unit.go index 62c91e1dd967..f79a575c148c 100644 --- a/state/unit.go +++ b/state/unit.go @@ -9,7 +9,7 @@ import ( "sort" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/state/unit_test.go b/state/unit_test.go index 5e382774ef09..0d85e2081b54 100644 --- a/state/unit_test.go +++ b/state/unit_test.go @@ -9,7 +9,7 @@ import ( "strings" "time" // Only used for time types. - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/state/watcher.go b/state/watcher.go index 32b75fa5bf04..fb9f4f2f2b05 100644 --- a/state/watcher.go +++ b/state/watcher.go @@ -15,7 +15,7 @@ import ( "sync" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/testcharms/charm.go b/testcharms/charm.go index 6d9e221d58a6..ead31a21270a 100644 --- a/testcharms/charm.go +++ b/testcharms/charm.go @@ -10,7 +10,7 @@ import ( "os" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/testcharms/repo/repo.go b/testcharms/repo/repo.go index 3d38d4873860..87edc098fc77 100644 --- a/testcharms/repo/repo.go +++ b/testcharms/repo/repo.go @@ -13,7 +13,7 @@ import ( "path/filepath" "runtime" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/utils/v3/fs" ) diff --git a/testing/factory/factory.go b/testing/factory/factory.go index 0dd8070b556e..76fef92a4ee0 100644 --- a/testing/factory/factory.go +++ b/testing/factory/factory.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - "github.com/juju/charm/v10" - charmresource "github.com/juju/charm/v10/resource" + "github.com/juju/charm/v11" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" "github.com/juju/utils/v3" diff --git a/testing/factory/factory_test.go b/testing/factory/factory_test.go index b894c196ae71..552b4ca0baed 100644 --- a/testing/factory/factory_test.go +++ b/testing/factory/factory_test.go @@ -8,7 +8,7 @@ import ( "regexp" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/upgrades/upgradevalidation/validation.go b/upgrades/upgradevalidation/validation.go index 716979874e7e..3d06a84d772c 100644 --- a/upgrades/upgradevalidation/validation.go +++ b/upgrades/upgradevalidation/validation.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" jujuhttp "github.com/juju/http/v2" diff --git a/worker/caasapplicationprovisioner/ops.go b/worker/caasapplicationprovisioner/ops.go index f979b13c37b3..e1da551419c4 100644 --- a/worker/caasapplicationprovisioner/ops.go +++ b/worker/caasapplicationprovisioner/ops.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/caasapplicationprovisioner/ops_test.go b/worker/caasapplicationprovisioner/ops_test.go index 77b7fdef2597..dd55e7a30f0b 100644 --- a/worker/caasapplicationprovisioner/ops_test.go +++ b/worker/caasapplicationprovisioner/ops_test.go @@ -4,7 +4,7 @@ package caasapplicationprovisioner_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock/testclock" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/worker/caasfirewaller/application_worker.go b/worker/caasfirewaller/application_worker.go index e619dd23a4fd..cc0714e4abd9 100644 --- a/worker/caasfirewaller/application_worker.go +++ b/worker/caasfirewaller/application_worker.go @@ -6,7 +6,7 @@ package caasfirewaller import ( "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/worker/v3" diff --git a/worker/caasfirewaller/worker.go b/worker/caasfirewaller/worker.go index ef1f477417d2..66e023a64858 100644 --- a/worker/caasfirewaller/worker.go +++ b/worker/caasfirewaller/worker.go @@ -4,7 +4,7 @@ package caasfirewaller import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/worker/v3" "github.com/juju/worker/v3/catacomb" diff --git a/worker/caasfirewaller/worker_test.go b/worker/caasfirewaller/worker_test.go index 45ba4bdf7a70..9483e5e9b87b 100644 --- a/worker/caasfirewaller/worker_test.go +++ b/worker/caasfirewaller/worker_test.go @@ -6,7 +6,7 @@ package caasfirewaller_test import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/worker/caasfirewallersidecar/worker.go b/worker/caasfirewallersidecar/worker.go index a1433bc2fa85..b28e25d4abee 100644 --- a/worker/caasfirewallersidecar/worker.go +++ b/worker/caasfirewallersidecar/worker.go @@ -4,7 +4,7 @@ package caasfirewallersidecar import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/worker/v3" "github.com/juju/worker/v3/catacomb" diff --git a/worker/caasfirewallersidecar/worker_test.go b/worker/caasfirewallersidecar/worker_test.go index 98162a8da1f7..ba1c344d8332 100644 --- a/worker/caasfirewallersidecar/worker_test.go +++ b/worker/caasfirewallersidecar/worker_test.go @@ -4,7 +4,7 @@ package caasfirewallersidecar_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" jc "github.com/juju/testing/checkers" diff --git a/worker/caasoperator/client.go b/worker/caasoperator/client.go index 43a857ad53c5..70b68afa9fcb 100644 --- a/worker/caasoperator/client.go +++ b/worker/caasoperator/client.go @@ -4,7 +4,7 @@ package caasoperator import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/version/v2" caasoperatorapi "github.com/juju/juju/api/agent/caasoperator" diff --git a/worker/caasoperator/download.go b/worker/caasoperator/download.go index 6ada48546315..5859c57e77b2 100644 --- a/worker/caasoperator/download.go +++ b/worker/caasoperator/download.go @@ -4,7 +4,7 @@ package caasoperator import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/juju/core/status" diff --git a/worker/caasoperator/localstate.go b/worker/caasoperator/localstate.go index b1538793f854..4c68a1ee622a 100644 --- a/worker/caasoperator/localstate.go +++ b/worker/caasoperator/localstate.go @@ -6,7 +6,7 @@ package caasoperator import ( "os" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/utils/v3" ) diff --git a/worker/caasoperator/localstate_test.go b/worker/caasoperator/localstate_test.go index 42ccad76faea..db50df4fd07e 100644 --- a/worker/caasoperator/localstate_test.go +++ b/worker/caasoperator/localstate_test.go @@ -6,7 +6,7 @@ package caasoperator_test import ( "path/filepath" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/worker/caasoperator/mock_test.go b/worker/caasoperator/mock_test.go index 56910e4798a5..c819c95832f2 100644 --- a/worker/caasoperator/mock_test.go +++ b/worker/caasoperator/mock_test.go @@ -4,7 +4,7 @@ package caasoperator_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/proxy" diff --git a/worker/caasoperator/remotestate/mock_test.go b/worker/caasoperator/remotestate/mock_test.go index b0259b2643ce..e768363a9a7a 100644 --- a/worker/caasoperator/remotestate/mock_test.go +++ b/worker/caasoperator/remotestate/mock_test.go @@ -6,7 +6,7 @@ package remotestate_test import ( "sync" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" caasoperatorapi "github.com/juju/juju/api/agent/caasoperator" diff --git a/worker/caasoperator/remotestate/snapshot.go b/worker/caasoperator/remotestate/snapshot.go index 430e1c3f5d6e..6a40b8802548 100644 --- a/worker/caasoperator/remotestate/snapshot.go +++ b/worker/caasoperator/remotestate/snapshot.go @@ -3,7 +3,7 @@ package remotestate -import "github.com/juju/charm/v10" +import "github.com/juju/charm/v11" // Snapshot is a snapshot of the remote state of the unit. type Snapshot struct { diff --git a/worker/caasoperator/remotestate/watcher_test.go b/worker/caasoperator/remotestate/watcher_test.go index 3bb889b69db4..2a03484cbddc 100644 --- a/worker/caasoperator/remotestate/watcher_test.go +++ b/worker/caasoperator/remotestate/watcher_test.go @@ -6,7 +6,7 @@ package remotestate_test import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock/testclock" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/worker/caasoperatorprovisioner/mock_test.go b/worker/caasoperatorprovisioner/mock_test.go index 8efe5762aa28..2f9b1fade611 100644 --- a/worker/caasoperatorprovisioner/mock_test.go +++ b/worker/caasoperatorprovisioner/mock_test.go @@ -6,7 +6,7 @@ package caasoperatorprovisioner_test import ( "sync" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/worker/caasoperatorprovisioner/worker.go b/worker/caasoperatorprovisioner/worker.go index cd6ff2b503c1..ecdcfe1cda57 100644 --- a/worker/caasoperatorprovisioner/worker.go +++ b/worker/caasoperatorprovisioner/worker.go @@ -17,7 +17,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/caasoperatorprovisioner/worker_test.go b/worker/caasoperatorprovisioner/worker_test.go index bd61bb6fd04c..f429066d7b8b 100644 --- a/worker/caasoperatorprovisioner/worker_test.go +++ b/worker/caasoperatorprovisioner/worker_test.go @@ -11,7 +11,7 @@ import ( "strconv" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock/testclock" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/worker/caasunitprovisioner/application_worker.go b/worker/caasunitprovisioner/application_worker.go index 5d3feca58a62..43db675f3179 100644 --- a/worker/caasunitprovisioner/application_worker.go +++ b/worker/caasunitprovisioner/application_worker.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/worker/v3" diff --git a/worker/caasunitprovisioner/worker.go b/worker/caasunitprovisioner/worker.go index ebf41b2e52e1..4b206268aa5f 100644 --- a/worker/caasunitprovisioner/worker.go +++ b/worker/caasunitprovisioner/worker.go @@ -10,7 +10,7 @@ package caasunitprovisioner import ( "sync" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/worker/v3" "github.com/juju/worker/v3/catacomb" diff --git a/worker/caasunitprovisioner/worker_test.go b/worker/caasunitprovisioner/worker_test.go index 9e27ae99c8c0..4b92bc58f521 100644 --- a/worker/caasunitprovisioner/worker_test.go +++ b/worker/caasunitprovisioner/worker_test.go @@ -6,7 +6,7 @@ package caasunitprovisioner_test import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/worker/firewaller/firewaller.go b/worker/firewaller/firewaller.go index 7ae780d88cd0..c312313eed6a 100644 --- a/worker/firewaller/firewaller.go +++ b/worker/firewaller/firewaller.go @@ -11,7 +11,7 @@ import ( "github.com/EvilSuperstars/go-cidrman" "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/worker/firewaller/firewaller_test.go b/worker/firewaller/firewaller_test.go index 54a9a7598a2f..625e95b59708 100644 --- a/worker/firewaller/firewaller_test.go +++ b/worker/firewaller/firewaller_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/clock/testclock" "github.com/juju/errors" diff --git a/worker/meterstatus/runner.go b/worker/meterstatus/runner.go index b1351b1413a0..eafffcbbdd34 100644 --- a/worker/meterstatus/runner.go +++ b/worker/meterstatus/runner.go @@ -4,7 +4,7 @@ package meterstatus import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/metrics/collect/context_test.go b/worker/metrics/collect/context_test.go index 1173181495d6..47fba17a2854 100644 --- a/worker/metrics/collect/context_test.go +++ b/worker/metrics/collect/context_test.go @@ -6,7 +6,7 @@ package collect_test import ( "time" - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" jc "github.com/juju/testing/checkers" "github.com/juju/utils/v3/keyvalues" gc "gopkg.in/check.v1" diff --git a/worker/metrics/collect/handler_test.go b/worker/metrics/collect/handler_test.go index a9a785daa24d..aad4ea58285b 100644 --- a/worker/metrics/collect/handler_test.go +++ b/worker/metrics/collect/handler_test.go @@ -10,7 +10,7 @@ import ( "strings" "time" - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/worker/metrics/collect/manifold.go b/worker/metrics/collect/manifold.go index ca1d0d3cffd6..c6c4e1222fe7 100644 --- a/worker/metrics/collect/manifold.go +++ b/worker/metrics/collect/manifold.go @@ -8,8 +8,8 @@ import ( "sync" "time" - corecharm "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + corecharm "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/worker/metrics/collect/manifold_test.go b/worker/metrics/collect/manifold_test.go index 7ade854b71cc..34ebe77fd0ef 100644 --- a/worker/metrics/collect/manifold_test.go +++ b/worker/metrics/collect/manifold_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/worker/metrics/sender/sender_test.go b/worker/metrics/sender/sender_test.go index 22b2958dfa99..de6c45a1fb54 100644 --- a/worker/metrics/sender/sender_test.go +++ b/worker/metrics/sender/sender_test.go @@ -13,7 +13,7 @@ import ( "path/filepath" "time" - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/worker/metrics/spool/manifold.go b/worker/metrics/spool/manifold.go index 860dde485d09..09a4d6639725 100644 --- a/worker/metrics/spool/manifold.go +++ b/worker/metrics/spool/manifold.go @@ -6,7 +6,7 @@ package spool import ( "time" - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/worker/v3" "github.com/juju/worker/v3/dependency" diff --git a/worker/metrics/spool/metrics.go b/worker/metrics/spool/metrics.go index a7358a0bf362..ff0b6fd27473 100644 --- a/worker/metrics/spool/metrics.go +++ b/worker/metrics/spool/metrics.go @@ -14,7 +14,7 @@ import ( "sync" "time" - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/utils/v3" diff --git a/worker/metrics/spool/metrics_test.go b/worker/metrics/spool/metrics_test.go index 8c9efa2e4013..a59540d9cbf2 100644 --- a/worker/metrics/spool/metrics_test.go +++ b/worker/metrics/spool/metrics_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/worker/migrationmaster/worker.go b/worker/migrationmaster/worker.go index 895cb5103d07..6cd4169b7c18 100644 --- a/worker/migrationmaster/worker.go +++ b/worker/migrationmaster/worker.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/worker/uniter/charm/bundles.go b/worker/uniter/charm/bundles.go index 7278e171f9c5..89db9255ced5 100644 --- a/worker/uniter/charm/bundles.go +++ b/worker/uniter/charm/bundles.go @@ -8,7 +8,7 @@ import ( "os" "path" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/juju/downloader" diff --git a/worker/uniter/charm/bundles_test.go b/worker/uniter/charm/bundles_test.go index 36e51d4ca73e..f8b3d3273ce6 100644 --- a/worker/uniter/charm/bundles_test.go +++ b/worker/uniter/charm/bundles_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "regexp" - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" "github.com/juju/loggo" jujutesting "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/charm/charm_test.go b/worker/uniter/charm/charm_test.go index 32250a8c0869..58b421471457 100644 --- a/worker/uniter/charm/charm_test.go +++ b/worker/uniter/charm/charm_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" "github.com/juju/collections/set" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/worker/uniter/charm/manifest_deployer.go b/worker/uniter/charm/manifest_deployer.go index 6898e22e438c..f167142cc66c 100644 --- a/worker/uniter/charm/manifest_deployer.go +++ b/worker/uniter/charm/manifest_deployer.go @@ -9,7 +9,7 @@ import ( "path/filepath" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/worker/uniter/container/workload.go b/worker/uniter/container/workload.go index ec655a59dd89..17396d19bff6 100644 --- a/worker/uniter/container/workload.go +++ b/worker/uniter/container/workload.go @@ -7,7 +7,7 @@ import ( "strconv" "sync" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/hook/hook.go b/worker/uniter/hook/hook.go index 342f64aebe2a..d92c4cd8cd1e 100644 --- a/worker/uniter/hook/hook.go +++ b/worker/uniter/hook/hook.go @@ -4,7 +4,7 @@ package hook import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/uniter/hook/hook_test.go b/worker/uniter/hook/hook_test.go index b818f3410a8d..5d4afe09d0ae 100644 --- a/worker/uniter/hook/hook_test.go +++ b/worker/uniter/hook/hook_test.go @@ -4,7 +4,7 @@ package hook_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/worker/uniter/leadership/resolver.go b/worker/uniter/leadership/resolver.go index ac54304fe6b2..b80bbc7a8bdb 100644 --- a/worker/uniter/leadership/resolver.go +++ b/worker/uniter/leadership/resolver.go @@ -4,7 +4,7 @@ package leadership import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/juju/core/life" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/leadership/resolver_test.go b/worker/uniter/leadership/resolver_test.go index af13783a889d..758f7b2c5041 100644 --- a/worker/uniter/leadership/resolver_test.go +++ b/worker/uniter/leadership/resolver_test.go @@ -4,7 +4,7 @@ package leadership_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/loggo" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/worker/uniter/op_callbacks.go b/worker/uniter/op_callbacks.go index 0704ed43398d..4adbba6664c7 100644 --- a/worker/uniter/op_callbacks.go +++ b/worker/uniter/op_callbacks.go @@ -6,8 +6,8 @@ package uniter import ( "fmt" - corecharm "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + corecharm "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/uniter/operation/deploy.go b/worker/uniter/operation/deploy.go index 3f309badeb02..81ba56f1bc53 100644 --- a/worker/uniter/operation/deploy.go +++ b/worker/uniter/operation/deploy.go @@ -6,7 +6,7 @@ package operation import ( "fmt" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/juju/worker/uniter/charm" diff --git a/worker/uniter/operation/deploy_test.go b/worker/uniter/operation/deploy_test.go index 1278bc94fab7..f29061d9aa98 100644 --- a/worker/uniter/operation/deploy_test.go +++ b/worker/uniter/operation/deploy_test.go @@ -4,7 +4,7 @@ package operation_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/testing" diff --git a/worker/uniter/operation/executor_test.go b/worker/uniter/operation/executor_test.go index 6ca217d555ce..db0ece79fc7d 100644 --- a/worker/uniter/operation/executor_test.go +++ b/worker/uniter/operation/executor_test.go @@ -6,7 +6,7 @@ package operation_test import ( "time" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/testing" diff --git a/worker/uniter/operation/factory_test.go b/worker/uniter/operation/factory_test.go index c79b0b9f8f7a..dfd21c266b55 100644 --- a/worker/uniter/operation/factory_test.go +++ b/worker/uniter/operation/factory_test.go @@ -4,7 +4,7 @@ package operation_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/loggo" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/worker/uniter/operation/failaction_test.go b/worker/uniter/operation/failaction_test.go index 4bb738afe20a..de47519a4724 100644 --- a/worker/uniter/operation/failaction_test.go +++ b/worker/uniter/operation/failaction_test.go @@ -4,7 +4,7 @@ package operation_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/operation/leader.go b/worker/uniter/operation/leader.go index 0d81c309213d..a73d931b183a 100644 --- a/worker/uniter/operation/leader.go +++ b/worker/uniter/operation/leader.go @@ -4,7 +4,7 @@ package operation import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/operation/leader_test.go b/worker/uniter/operation/leader_test.go index a8f8e6dbbb38..decc860b2a40 100644 --- a/worker/uniter/operation/leader_test.go +++ b/worker/uniter/operation/leader_test.go @@ -4,7 +4,7 @@ package operation_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/loggo" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/operation/remoteinit_test.go b/worker/uniter/operation/remoteinit_test.go index 0f73ee76994a..14115372a436 100644 --- a/worker/uniter/operation/remoteinit_test.go +++ b/worker/uniter/operation/remoteinit_test.go @@ -4,7 +4,7 @@ package operation_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/operation/runaction_test.go b/worker/uniter/operation/runaction_test.go index 363f615bd0cd..68dfacf8c420 100644 --- a/worker/uniter/operation/runaction_test.go +++ b/worker/uniter/operation/runaction_test.go @@ -6,7 +6,7 @@ package operation_test import ( "time" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/worker/uniter/operation/runhook.go b/worker/uniter/operation/runhook.go index 001f5fd9e7b7..1735f935e8b1 100644 --- a/worker/uniter/operation/runhook.go +++ b/worker/uniter/operation/runhook.go @@ -6,7 +6,7 @@ package operation import ( "fmt" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/uniter/operation/runhook_test.go b/worker/uniter/operation/runhook_test.go index 41d493017758..634543345473 100644 --- a/worker/uniter/operation/runhook_test.go +++ b/worker/uniter/operation/runhook_test.go @@ -4,7 +4,7 @@ package operation_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/operation/state_test.go b/worker/uniter/operation/state_test.go index ad1612ee9296..8d65ad80c809 100644 --- a/worker/uniter/operation/state_test.go +++ b/worker/uniter/operation/state_test.go @@ -4,7 +4,7 @@ package operation_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/worker/uniter/operation/util_test.go b/worker/uniter/operation/util_test.go index a61a70a3ea21..9d758f018dc7 100644 --- a/worker/uniter/operation/util_test.go +++ b/worker/uniter/operation/util_test.go @@ -6,7 +6,7 @@ package operation_test import ( "sync" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/worker/uniter/reboot/resolver.go b/worker/uniter/reboot/resolver.go index 4905cf816bc4..f9dab246c5ab 100644 --- a/worker/uniter/reboot/resolver.go +++ b/worker/uniter/reboot/resolver.go @@ -4,7 +4,7 @@ package reboot import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/juju/core/model" diff --git a/worker/uniter/relation/mock_test.go b/worker/uniter/relation/mock_test.go index 62a0d2928772..47b3c92e4021 100644 --- a/worker/uniter/relation/mock_test.go +++ b/worker/uniter/relation/mock_test.go @@ -6,7 +6,7 @@ package relation_test import ( "fmt" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/operation" diff --git a/worker/uniter/relation/relationer.go b/worker/uniter/relation/relationer.go index 014f37b01569..bd616cef6cd0 100644 --- a/worker/uniter/relation/relationer.go +++ b/worker/uniter/relation/relationer.go @@ -6,7 +6,7 @@ package relation import ( "fmt" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/worker/v3/dependency" diff --git a/worker/uniter/relation/relationer_test.go b/worker/uniter/relation/relationer_test.go index 9edef6dd6eab..f4185dcb6d28 100644 --- a/worker/uniter/relation/relationer_test.go +++ b/worker/uniter/relation/relationer_test.go @@ -6,8 +6,8 @@ package relation_test import ( "fmt" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/loggo" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/relation/resolver.go b/worker/uniter/relation/resolver.go index b1b4212ecbb9..093744754de8 100644 --- a/worker/uniter/relation/resolver.go +++ b/worker/uniter/relation/resolver.go @@ -4,7 +4,7 @@ package relation import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/uniter/relation/resolver_test.go b/worker/uniter/relation/resolver_test.go index 7ebd49c8f42f..1f88ccc27c1d 100644 --- a/worker/uniter/relation/resolver_test.go +++ b/worker/uniter/relation/resolver_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "sync/atomic" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/worker/uniter/relation/state.go b/worker/uniter/relation/state.go index 4de4372f70fb..18a8b3f973a8 100644 --- a/worker/uniter/relation/state.go +++ b/worker/uniter/relation/state.go @@ -6,7 +6,7 @@ package relation import ( "fmt" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/kr/pretty" "gopkg.in/yaml.v2" diff --git a/worker/uniter/relation/state_test.go b/worker/uniter/relation/state_test.go index 4a84834dae5a..07e0e68faeb3 100644 --- a/worker/uniter/relation/state_test.go +++ b/worker/uniter/relation/state_test.go @@ -6,7 +6,7 @@ package relation_test import ( "fmt" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/loggo" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/worker/uniter/relation/statetracker.go b/worker/uniter/relation/statetracker.go index 7099c432a8e8..a7089635a6c7 100644 --- a/worker/uniter/relation/statetracker.go +++ b/worker/uniter/relation/statetracker.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/worker/v3" diff --git a/worker/uniter/relation/statetracker_test.go b/worker/uniter/relation/statetracker_test.go index 65d1d953cce9..5b376f740015 100644 --- a/worker/uniter/relation/statetracker_test.go +++ b/worker/uniter/relation/statetracker_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/remotestate/mock_test.go b/worker/uniter/remotestate/mock_test.go index f3f6d9b02bc5..e9d2ba7d5135 100644 --- a/worker/uniter/remotestate/mock_test.go +++ b/worker/uniter/remotestate/mock_test.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/uniter/remotestate/state.go b/worker/uniter/remotestate/state.go index ed7c3f37b27f..34528d75263c 100644 --- a/worker/uniter/remotestate/state.go +++ b/worker/uniter/remotestate/state.go @@ -6,7 +6,7 @@ package remotestate import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/names/v4" "github.com/juju/juju/api/agent/uniter" diff --git a/worker/uniter/remotestate/watcher.go b/worker/uniter/remotestate/watcher.go index fc94a30d0a6a..a8fbb79fc84c 100644 --- a/worker/uniter/remotestate/watcher.go +++ b/worker/uniter/remotestate/watcher.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/collections/set" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/uniter/resolver.go b/worker/uniter/resolver.go index 255cc40c1c23..b758de810772 100644 --- a/worker/uniter/resolver.go +++ b/worker/uniter/resolver.go @@ -6,8 +6,8 @@ package uniter import ( "fmt" - corecharm "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + corecharm "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/juju/core/life" diff --git a/worker/uniter/resolver/locker_test.go b/worker/uniter/resolver/locker_test.go index 6c1a7e125d0b..59a3322c5293 100644 --- a/worker/uniter/resolver/locker_test.go +++ b/worker/uniter/resolver/locker_test.go @@ -4,7 +4,7 @@ package resolver_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/loggo" "github.com/juju/testing" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/resolver/loop.go b/worker/uniter/resolver/loop.go index 4b8ab51d039a..6752cd01aade 100644 --- a/worker/uniter/resolver/loop.go +++ b/worker/uniter/resolver/loop.go @@ -6,8 +6,8 @@ package resolver import ( "time" - corecharm "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + corecharm "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/mutex/v2" diff --git a/worker/uniter/resolver/loop_test.go b/worker/uniter/resolver/loop_test.go index 03a077610275..eabd90cae3d8 100644 --- a/worker/uniter/resolver/loop_test.go +++ b/worker/uniter/resolver/loop_test.go @@ -7,7 +7,7 @@ import ( "errors" "time" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/loggo" "github.com/juju/mutex/v2" envtesting "github.com/juju/testing" diff --git a/worker/uniter/resolver/opfactory.go b/worker/uniter/resolver/opfactory.go index 993a74276fea..58e4dc8b7b3f 100644 --- a/worker/uniter/resolver/opfactory.go +++ b/worker/uniter/resolver/opfactory.go @@ -4,7 +4,7 @@ package resolver import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/juju/core/model" diff --git a/worker/uniter/resolver/opfactory_test.go b/worker/uniter/resolver/opfactory_test.go index 489b5e8736fe..6b46908fee94 100644 --- a/worker/uniter/resolver/opfactory_test.go +++ b/worker/uniter/resolver/opfactory_test.go @@ -6,7 +6,7 @@ package resolver_test import ( "errors" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/worker/uniter/resolver_test.go b/worker/uniter/resolver_test.go index 3e5f0d7f9c68..c795749dd748 100644 --- a/worker/uniter/resolver_test.go +++ b/worker/uniter/resolver_test.go @@ -6,7 +6,7 @@ package uniter_test import ( "fmt" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/worker/uniter/runner/context/context.go b/worker/uniter/runner/context/context.go index 2321ce9ab8d9..058a25b5fc72 100644 --- a/worker/uniter/runner/context/context.go +++ b/worker/uniter/runner/context/context.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/worker/uniter/runner/context/context_test.go b/worker/uniter/runner/context/context_test.go index 634f52391937..111aa063b988 100644 --- a/worker/uniter/runner/context/context_test.go +++ b/worker/uniter/runner/context/context_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" "github.com/juju/testing" diff --git a/worker/uniter/runner/context/contextfactory.go b/worker/uniter/runner/context/contextfactory.go index ba0190773d6c..1e79b11de4d9 100644 --- a/worker/uniter/runner/context/contextfactory.go +++ b/worker/uniter/runner/context/contextfactory.go @@ -8,7 +8,7 @@ import ( "math/rand" "time" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/worker/uniter/runner/context/contextfactory_test.go b/worker/uniter/runner/context/contextfactory_test.go index 4d61e7be5440..643d0906c5d9 100644 --- a/worker/uniter/runner/context/contextfactory_test.go +++ b/worker/uniter/runner/context/contextfactory_test.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/clock/testclock" "github.com/juju/errors" "github.com/juju/loggo" diff --git a/worker/uniter/runner/context/export_test.go b/worker/uniter/runner/context/export_test.go index b54c57902f9b..7b651ce9a110 100644 --- a/worker/uniter/runner/context/export_test.go +++ b/worker/uniter/runner/context/export_test.go @@ -4,7 +4,7 @@ package context import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/worker/uniter/runner/context/mocks/hookunit_mock.go b/worker/uniter/runner/context/mocks/hookunit_mock.go index 4a0810d244ed..f288ddccaf7b 100644 --- a/worker/uniter/runner/context/mocks/hookunit_mock.go +++ b/worker/uniter/runner/context/mocks/hookunit_mock.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" uniter "github.com/juju/juju/api/agent/uniter" status "github.com/juju/juju/core/status" params "github.com/juju/juju/rpc/params" diff --git a/worker/uniter/runner/context/payloads/context_test.go b/worker/uniter/runner/context/payloads/context_test.go index 0ab5e06d8374..02be3f5412b6 100644 --- a/worker/uniter/runner/context/payloads/context_test.go +++ b/worker/uniter/runner/context/payloads/context_test.go @@ -4,7 +4,7 @@ package payloads_test import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/testing" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/worker/uniter/runner/context/resources/base_test.go b/worker/uniter/runner/context/resources/base_test.go index 16d2458f1c65..dd80364ab290 100644 --- a/worker/uniter/runner/context/resources/base_test.go +++ b/worker/uniter/runner/context/resources/base_test.go @@ -7,7 +7,7 @@ import ( "io" "time" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/testing" gc "gopkg.in/check.v1" diff --git a/worker/uniter/runner/context/resources/content.go b/worker/uniter/runner/context/resources/content.go index e0c648e5236e..0560844567b2 100644 --- a/worker/uniter/runner/context/resources/content.go +++ b/worker/uniter/runner/context/resources/content.go @@ -7,7 +7,7 @@ import ( "bytes" "io" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "github.com/juju/utils/v3" ) diff --git a/worker/uniter/runner/context/resources/content_test.go b/worker/uniter/runner/context/resources/content_test.go index 3923ee87a017..9adc7f2e7c0f 100644 --- a/worker/uniter/runner/context/resources/content_test.go +++ b/worker/uniter/runner/context/resources/content_test.go @@ -7,7 +7,7 @@ import ( "io" "strings" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/worker/uniter/runner/context/resources/context.go b/worker/uniter/runner/context/resources/context.go index e4427f1cf90b..dea4908e9024 100644 --- a/worker/uniter/runner/context/resources/context.go +++ b/worker/uniter/runner/context/resources/context.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" ) diff --git a/worker/uniter/runner/context/resources/resource.go b/worker/uniter/runner/context/resources/resource.go index ef7ae633086b..0974b34bd1ee 100644 --- a/worker/uniter/runner/context/resources/resource.go +++ b/worker/uniter/runner/context/resources/resource.go @@ -7,7 +7,7 @@ import ( "bytes" "io" - charmresource "github.com/juju/charm/v10/resource" + charmresource "github.com/juju/charm/v11/resource" "github.com/juju/errors" "gopkg.in/httprequest.v1" "gopkg.in/yaml.v2" diff --git a/worker/uniter/runner/context/util_test.go b/worker/uniter/runner/context/util_test.go index 28199f38112d..d3d747ea39f2 100644 --- a/worker/uniter/runner/context/util_test.go +++ b/worker/uniter/runner/context/util_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/clock/testclock" "github.com/juju/names/v4" "github.com/juju/proxy" diff --git a/worker/uniter/runner/factory.go b/worker/uniter/runner/factory.go index e2b15102dc27..f9f40b577208 100644 --- a/worker/uniter/runner/factory.go +++ b/worker/uniter/runner/factory.go @@ -4,7 +4,7 @@ package runner import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/uniter/runner/factory_test.go b/worker/uniter/runner/factory_test.go index 1820f8aaec46..c6b89db7f066 100644 --- a/worker/uniter/runner/factory_test.go +++ b/worker/uniter/runner/factory_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/clock/testclock" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/worker/uniter/runner/jujuc/action-set.go b/worker/uniter/runner/jujuc/action-set.go index 7b2a17fc4fbe..b0f44e9b1667 100644 --- a/worker/uniter/runner/jujuc/action-set.go +++ b/worker/uniter/runner/jujuc/action-set.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/gnuflag" diff --git a/worker/uniter/runner/jujuc/add-metric.go b/worker/uniter/runner/jujuc/add-metric.go index 3ffffba72fe9..5b1b864223b8 100644 --- a/worker/uniter/runner/jujuc/add-metric.go +++ b/worker/uniter/runner/jujuc/add-metric.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/errors" "github.com/juju/gnuflag" diff --git a/worker/uniter/runner/jujuc/context.go b/worker/uniter/runner/jujuc/context.go index e65c9595414e..f84afcdd5d8d 100644 --- a/worker/uniter/runner/jujuc/context.go +++ b/worker/uniter/runner/jujuc/context.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names/v4" diff --git a/worker/uniter/runner/jujuc/jujuctesting/suite.go b/worker/uniter/runner/jujuc/jujuctesting/suite.go index ebff304701d5..920a7247b30e 100644 --- a/worker/uniter/runner/jujuc/jujuctesting/suite.go +++ b/worker/uniter/runner/jujuc/jujuctesting/suite.go @@ -6,7 +6,7 @@ package jujuctesting import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/testing" gc "gopkg.in/check.v1" diff --git a/worker/uniter/runner/jujuc/jujuctesting/unit.go b/worker/uniter/runner/jujuc/jujuctesting/unit.go index e5eae6f518ac..ed744c42124b 100644 --- a/worker/uniter/runner/jujuc/jujuctesting/unit.go +++ b/worker/uniter/runner/jujuc/jujuctesting/unit.go @@ -4,7 +4,7 @@ package jujuctesting import ( - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/juju/core/application" diff --git a/worker/uniter/runner/jujuc/mocks/context_mock.go b/worker/uniter/runner/jujuc/mocks/context_mock.go index 635536a3e55f..21736a4a569e 100644 --- a/worker/uniter/runner/jujuc/mocks/context_mock.go +++ b/worker/uniter/runner/jujuc/mocks/context_mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" time "time" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" application "github.com/juju/juju/core/application" network "github.com/juju/juju/core/network" payloads "github.com/juju/juju/core/payloads" diff --git a/worker/uniter/runner/jujuc/payload-register.go b/worker/uniter/runner/jujuc/payload-register.go index 7459db95a580..19f2464fafe1 100644 --- a/worker/uniter/runner/jujuc/payload-register.go +++ b/worker/uniter/runner/jujuc/payload-register.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/errors" diff --git a/worker/uniter/runner/jujuc/payload-register_test.go b/worker/uniter/runner/jujuc/payload-register_test.go index c6f7b0afb128..8cf8a34ad5ae 100644 --- a/worker/uniter/runner/jujuc/payload-register_test.go +++ b/worker/uniter/runner/jujuc/payload-register_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/cmd/v3" "github.com/juju/cmd/v3/cmdtesting" "github.com/juju/errors" diff --git a/worker/uniter/runner/jujuc/restricted.go b/worker/uniter/runner/jujuc/restricted.go index d6f415224349..3a99bcf07ff8 100644 --- a/worker/uniter/runner/jujuc/restricted.go +++ b/worker/uniter/runner/jujuc/restricted.go @@ -6,7 +6,7 @@ package jujuc import ( "time" - "github.com/juju/charm/v10" + "github.com/juju/charm/v11" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/uniter/runner/mocks/context_mock.go b/worker/uniter/runner/mocks/context_mock.go index 00ceb79a6c53..31dbc07b6749 100644 --- a/worker/uniter/runner/mocks/context_mock.go +++ b/worker/uniter/runner/mocks/context_mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" time "time" - charm "github.com/juju/charm/v10" + charm "github.com/juju/charm/v11" application "github.com/juju/juju/core/application" model "github.com/juju/juju/core/model" network "github.com/juju/juju/core/network" diff --git a/worker/uniter/runner/runner_test.go b/worker/uniter/runner/runner_test.go index b840cce76645..20a2f73eb376 100644 --- a/worker/uniter/runner/runner_test.go +++ b/worker/uniter/runner/runner_test.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/loggo" envtesting "github.com/juju/testing" diff --git a/worker/uniter/secrets/resolver.go b/worker/uniter/secrets/resolver.go index e4cacbf2cb43..e92326228a3b 100644 --- a/worker/uniter/secrets/resolver.go +++ b/worker/uniter/secrets/resolver.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/worker/uniter/secrets/resolver_test.go b/worker/uniter/secrets/resolver_test.go index d91e8e5ba744..fb8e48742b2e 100644 --- a/worker/uniter/secrets/resolver_test.go +++ b/worker/uniter/secrets/resolver_test.go @@ -4,7 +4,7 @@ package secrets_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/loggo" jc "github.com/juju/testing/checkers" "go.uber.org/mock/gomock" diff --git a/worker/uniter/secrets/secrets_test.go b/worker/uniter/secrets/secrets_test.go index 9042744dd639..ba0fd7012399 100644 --- a/worker/uniter/secrets/secrets_test.go +++ b/worker/uniter/secrets/secrets_test.go @@ -4,7 +4,7 @@ package secrets_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/loggo" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/secrets/state.go b/worker/uniter/secrets/state.go index 80bf57b5b836..fe6301f92b6f 100644 --- a/worker/uniter/secrets/state.go +++ b/worker/uniter/secrets/state.go @@ -4,7 +4,7 @@ package secrets import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/collections/set" "github.com/juju/errors" "gopkg.in/yaml.v2" diff --git a/worker/uniter/storage/attachments.go b/worker/uniter/storage/attachments.go index d78460cd9f89..b482ed561f31 100644 --- a/worker/uniter/storage/attachments.go +++ b/worker/uniter/storage/attachments.go @@ -4,7 +4,7 @@ package storage import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/uniter/storage/attachments_test.go b/worker/uniter/storage/attachments_test.go index f90686be3287..a44c7154f843 100644 --- a/worker/uniter/storage/attachments_test.go +++ b/worker/uniter/storage/attachments_test.go @@ -4,7 +4,7 @@ package storage_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/loggo" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/storage/resolver.go b/worker/uniter/storage/resolver.go index f916853df63f..b9ad584fbfc0 100644 --- a/worker/uniter/storage/resolver.go +++ b/worker/uniter/storage/resolver.go @@ -4,7 +4,7 @@ package storage import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/uniter/storage/state.go b/worker/uniter/storage/state.go index 73fe36ebd5c4..2ba4a3068f05 100644 --- a/worker/uniter/storage/state.go +++ b/worker/uniter/storage/state.go @@ -4,7 +4,7 @@ package storage import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "gopkg.in/yaml.v2" diff --git a/worker/uniter/storage/state_test.go b/worker/uniter/storage/state_test.go index 1892db0de609..8b13b0042aad 100644 --- a/worker/uniter/storage/state_test.go +++ b/worker/uniter/storage/state_test.go @@ -4,7 +4,7 @@ package storage_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/names/v4" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/uniter.go b/worker/uniter/uniter.go index 1b242d973962..b25b10d5a065 100644 --- a/worker/uniter/uniter.go +++ b/worker/uniter/uniter.go @@ -8,7 +8,7 @@ import ( "os" "sync" - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/errors" "github.com/juju/names/v4" diff --git a/worker/uniter/uniter_test.go b/worker/uniter/uniter_test.go index 98adcb5c26e1..05a75a7d71d1 100644 --- a/worker/uniter/uniter_test.go +++ b/worker/uniter/uniter_test.go @@ -10,8 +10,8 @@ import ( "strings" "syscall" - corecharm "github.com/juju/charm/v10" - "github.com/juju/charm/v10/hooks" + corecharm "github.com/juju/charm/v11" + "github.com/juju/charm/v11/hooks" "github.com/juju/errors" "github.com/juju/loggo" jc "github.com/juju/testing/checkers" diff --git a/worker/uniter/upgradeseries/resolver.go b/worker/uniter/upgradeseries/resolver.go index 7ae93e496eaf..183aa0c3bfcd 100644 --- a/worker/uniter/upgradeseries/resolver.go +++ b/worker/uniter/upgradeseries/resolver.go @@ -4,7 +4,7 @@ package upgradeseries import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/juju/core/model" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/upgradeseries/resolver_test.go b/worker/uniter/upgradeseries/resolver_test.go index 3a0d598cde1e..4da1261cc9a4 100644 --- a/worker/uniter/upgradeseries/resolver_test.go +++ b/worker/uniter/upgradeseries/resolver_test.go @@ -4,7 +4,7 @@ package upgradeseries_test import ( - "github.com/juju/charm/v10/hooks" + "github.com/juju/charm/v11/hooks" "github.com/juju/loggo" "github.com/juju/testing" "go.uber.org/mock/gomock" diff --git a/worker/uniter/util_test.go b/worker/uniter/util_test.go index f122076fd594..523431e71c9f 100644 --- a/worker/uniter/util_test.go +++ b/worker/uniter/util_test.go @@ -16,7 +16,7 @@ import ( "time" pebbleclient "github.com/canonical/pebble/client" - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" "github.com/juju/clock" "github.com/juju/collections/set" "github.com/juju/errors" diff --git a/worker/uniter/verifycharmprofile/verifycharmprofile.go b/worker/uniter/verifycharmprofile/verifycharmprofile.go index 1fc62d54b89c..5a52b2cbd8bb 100644 --- a/worker/uniter/verifycharmprofile/verifycharmprofile.go +++ b/worker/uniter/verifycharmprofile/verifycharmprofile.go @@ -4,7 +4,7 @@ package verifycharmprofile import ( - corecharm "github.com/juju/charm/v10" + corecharm "github.com/juju/charm/v11" "github.com/juju/juju/core/lxdprofile" "github.com/juju/juju/core/model" From f1ae8f5c7813fd110139c74ca1aea0b05c00463c Mon Sep 17 00:00:00 2001 From: Jack Shaw Date: Mon, 21 Aug 2023 12:44:52 +0100 Subject: [PATCH 3/7] Support bases in bundles This commit backports _some_ of the changes from the PR https://github.com/juju/juju/pull/15725 However, instead of converting to bases at the edge, we convert to series at the edge. This is because there are a lot of changes in later versions that using bases throughout depends on which are not present in 3.1, which would require expensive backports We also do NOT backport changes to GetChanges and GetChangesMapArgs, as they are not required to backport this feature. This simplifies the change significantly --- api/common/charms/common.go | 2 +- api/common/charms/common_test.go | 1 - apiserver/facades/client/bundle/bundle.go | 1 + .../facades/client/bundle/bundle_test.go | 12 +- .../application/deployer/bundlehandler.go | 11 +- core/bundle/changes/changes.go | 5 +- core/bundle/changes/changes_test.go | 187 ++++++++++++++++++ core/bundle/changes/handlers.go | 66 ++++++- 8 files changed, 265 insertions(+), 20 deletions(-) diff --git a/api/common/charms/common.go b/api/common/charms/common.go index a7f972f8df23..8223e8fd51fe 100644 --- a/api/common/charms/common.go +++ b/api/common/charms/common.go @@ -390,7 +390,7 @@ func (c *charmImpl) Revision() int { func convertCharmManifest(input *params.CharmManifest) (*charm.Manifest, error) { if input == nil { - return &charm.Manifest{}, nil + return nil, nil } res := []charm.Base(nil) for _, v := range input.Bases { diff --git a/api/common/charms/common_test.go b/api/common/charms/common_test.go index 41b3ee46beb2..1ac9eb3cfb02 100644 --- a/api/common/charms/common_test.go +++ b/api/common/charms/common_test.go @@ -189,7 +189,6 @@ func (s *suite) TestApplicationCharmInfo(c *gc.C) { Name: "foobar", MinJujuVersion: version.MustParse("2.9.0"), }, - Manifest: &charm.Manifest{}, } c.Assert(got, gc.DeepEquals, want) } diff --git a/apiserver/facades/client/bundle/bundle.go b/apiserver/facades/client/bundle/bundle.go index 6fbf71cee59e..f17d95dd202e 100644 --- a/apiserver/facades/client/bundle/bundle.go +++ b/apiserver/facades/client/bundle/bundle.go @@ -210,6 +210,7 @@ func (b *BundleAPI) GetChangesMapArgs(args params.BundleChangesParams) (params.B } return b.doGetBundleChangesMapArgs(args, vs, func(changes []bundlechanges.Change, results *params.BundleChangesMapArgsResults) error { results.Changes = make([]*params.BundleChangesMapArgs, len(changes)) + results.Errors = make([]string, len(changes)) for i, c := range changes { args, err := c.Args() if err != nil { diff --git a/apiserver/facades/client/bundle/bundle_test.go b/apiserver/facades/client/bundle/bundle_test.go index 2fbd7b8dae04..b50df22fdcda 100644 --- a/apiserver/facades/client/bundle/bundle_test.go +++ b/apiserver/facades/client/bundle/bundle_test.go @@ -548,7 +548,9 @@ func (s *bundleSuite) TestGetChangesMapArgsSuccess(c *gc.C) { }, Requires: []string{"deploy-1", "deploy-3"}, }}, gc.Commentf("\nobtained: %s\n", pretty.Sprint(r.Changes))) - c.Assert(r.Errors, gc.IsNil) + for _, err := range r.Errors { + c.Assert(err, gc.Equals, "") + } } func (s *bundleSuite) TestGetChangesMapArgsSuccessCharmHubRevision(c *gc.C) { @@ -581,7 +583,9 @@ func (s *bundleSuite) TestGetChangesMapArgsSuccessCharmHubRevision(c *gc.C) { }, Requires: []string{"addCharm-0"}, }}) - c.Assert(r.Errors, gc.IsNil) + for _, err := range r.Errors { + c.Assert(err, gc.Equals, "") + } } func (s *bundleSuite) TestGetChangesMapArgsKubernetes(c *gc.C) { @@ -659,7 +663,9 @@ func (s *bundleSuite) TestGetChangesMapArgsKubernetes(c *gc.C) { }, Requires: []string{"deploy-1", "deploy-3"}, }}, gc.Commentf("\nobtained: %s\n", pretty.Sprint(r.Changes))) - c.Assert(r.Errors, gc.IsNil) + for _, err := range r.Errors { + c.Assert(err, gc.Equals, "") + } } func (s *bundleSuite) TestGetChangesMapArgsBundleEndpointBindingsSuccess(c *gc.C) { diff --git a/cmd/juju/application/deployer/bundlehandler.go b/cmd/juju/application/deployer/bundlehandler.go index f1a96e660a0e..8c7d9d287952 100644 --- a/cmd/juju/application/deployer/bundlehandler.go +++ b/cmd/juju/application/deployer/bundlehandler.go @@ -339,12 +339,13 @@ func (h *bundleHandler) resolveCharmsAndEndpoints() error { } var base corebase.Base - if spec.Series != "" { - var err error + if spec.Base != "" { + base, err = corebase.ParseBaseFromString(spec.Base) + } else if spec.Series != "" { base, err = corebase.GetBaseFromSeries(spec.Series) - if err != nil { - return errors.Trace(err) - } + } + if err != nil { + return errors.Trace(err) } channel, origin, err := h.constructChannelAndOrigin(ch, base, spec.Channel, cons) diff --git a/core/bundle/changes/changes.go b/core/bundle/changes/changes.go index a5038c51ab7b..4339e7d256d1 100644 --- a/core/bundle/changes/changes.go +++ b/core/bundle/changes/changes.go @@ -95,7 +95,10 @@ func FromData(config ChangesConfig) ([]Change, error) { var addedMachines map[string]*AddMachineChange if resolver.bundle.Type != kubernetes { - addedMachines = resolver.handleMachines() + addedMachines, err = resolver.handleMachines() + if err != nil { + return nil, errors.Trace(err) + } } deployedBundleApps := alreadyDeployedApplicationsFromBundle(model, config.Bundle.Applications) diff --git a/core/bundle/changes/changes_test.go b/core/bundle/changes/changes_test.go index ffbece53167c..70e30200a304 100644 --- a/core/bundle/changes/changes_test.go +++ b/core/bundle/changes/changes_test.go @@ -900,6 +900,193 @@ func (s *changesSuite) TestSimpleBundle(c *gc.C) { s.assertParseData(c, content, expected) } +func (s *changesSuite) TestSimpleBundleWithBases(c *gc.C) { + content := ` + applications: + mediawiki: + charm: ch:mediawiki + base: ubuntu@20.04 + num_units: 1 + expose: true + options: + debug: false + annotations: + gui-x: "609" + gui-y: "-15" + resources: + data: 3 + mysql: + charm: ch:mysql + base: ubuntu@20.04 + num_units: 1 + resources: + data: "./resources/data.tar" + default-base: ubuntu@22.04 + relations: + - - mediawiki:db + - mysql:db + ` + expected := []record{{ + Id: "addCharm-0", + Method: "addCharm", + Params: bundlechanges.AddCharmParams{ + Charm: "ch:mediawiki", + Series: "focal", + }, + GUIArgs: []interface{}{"ch:mediawiki", "focal", ""}, + Args: map[string]interface{}{ + "charm": "ch:mediawiki", + "series": "focal", + }, + }, { + Id: "deploy-1", + Method: "deploy", + Params: bundlechanges.AddApplicationParams{ + Charm: "$addCharm-0", + Application: "mediawiki", + Series: "focal", + Options: map[string]interface{}{"debug": false}, + Resources: map[string]int{"data": 3}, + }, + GUIArgs: []interface{}{ + "$addCharm-0", + "focal", + "mediawiki", + map[string]interface{}{"debug": false}, + "", + map[string]string{}, + map[string]string{}, + map[string]int{"data": 3}, + 0, + "", + }, + Args: map[string]interface{}{ + "application": "mediawiki", + "charm": "$addCharm-0", + "options": map[string]interface{}{ + "debug": false, + }, + "resources": map[string]interface{}{ + "data": float64(3), + }, + "series": "focal", + }, + Requires: []string{"addCharm-0"}, + }, { + Id: "expose-2", + Method: "expose", + Params: bundlechanges.ExposeParams{ + Application: "$deploy-1", + }, + GUIArgs: []interface{}{"$deploy-1", nil}, + Args: map[string]interface{}{ + "application": "$deploy-1", + }, + Requires: []string{"deploy-1"}, + }, { + Id: "setAnnotations-3", + Method: "setAnnotations", + Params: bundlechanges.SetAnnotationsParams{ + Id: "$deploy-1", + EntityType: bundlechanges.ApplicationType, + Annotations: map[string]string{"gui-x": "609", "gui-y": "-15"}, + }, + GUIArgs: []interface{}{ + "$deploy-1", + "application", + map[string]string{"gui-x": "609", "gui-y": "-15"}, + }, + Args: map[string]interface{}{ + "annotations": map[string]interface{}{ + "gui-x": "609", + "gui-y": "-15", + }, + "entity-type": "application", + "id": "$deploy-1", + }, + Requires: []string{"deploy-1"}, + }, { + Id: "addCharm-4", + Method: "addCharm", + Params: bundlechanges.AddCharmParams{ + Charm: "ch:mysql", + Series: "focal", + }, + GUIArgs: []interface{}{"ch:mysql", "focal", ""}, + Args: map[string]interface{}{ + "charm": "ch:mysql", + "series": "focal", + }, + }, { + Id: "deploy-5", + Method: "deploy", + Params: bundlechanges.AddApplicationParams{ + Charm: "$addCharm-4", + Application: "mysql", + Series: "focal", + LocalResources: map[string]string{"data": "./resources/data.tar"}, + }, + GUIArgs: []interface{}{ + "$addCharm-4", + "focal", + "mysql", + map[string]interface{}{}, + "", + map[string]string{}, + map[string]string{}, + map[string]int{}, + 0, + "", + }, + Args: map[string]interface{}{ + "application": "mysql", + "charm": "$addCharm-4", + "local-resources": map[string]interface{}{ + "data": "./resources/data.tar", + }, + "series": "focal", + }, + Requires: []string{"addCharm-4"}, + }, { + Id: "addRelation-6", + Method: "addRelation", + Params: bundlechanges.AddRelationParams{ + Endpoint1: "$deploy-1:db", + Endpoint2: "$deploy-5:db", + }, + GUIArgs: []interface{}{"$deploy-1:db", "$deploy-5:db"}, + Args: map[string]interface{}{ + "endpoint1": "$deploy-1:db", + "endpoint2": "$deploy-5:db", + }, + Requires: []string{"deploy-1", "deploy-5"}, + }, { + Id: "addUnit-7", + Method: "addUnit", + Params: bundlechanges.AddUnitParams{ + Application: "$deploy-1", + }, + GUIArgs: []interface{}{"$deploy-1", nil}, + Args: map[string]interface{}{ + "application": "$deploy-1", + }, + Requires: []string{"deploy-1"}, + }, { + Id: "addUnit-8", + Method: "addUnit", + Params: bundlechanges.AddUnitParams{ + Application: "$deploy-5", + }, + GUIArgs: []interface{}{"$deploy-5", nil}, + Args: map[string]interface{}{ + "application": "$deploy-5", + }, + Requires: []string{"deploy-5"}, + }} + + s.assertParseData(c, content, expected) +} + func (s *changesSuite) TestSimpleBundleWithDevices(c *gc.C) { content := ` applications: diff --git a/core/bundle/changes/handlers.go b/core/bundle/changes/handlers.go index 6798b45e8e2b..4db0f0b131a3 100644 --- a/core/bundle/changes/handlers.go +++ b/core/bundle/changes/handlers.go @@ -33,7 +33,16 @@ type resolver struct { func (r *resolver) handleApplications() (map[string]string, error) { add := r.changes.add applications := r.bundle.Applications - defaultSeries := r.bundle.Series + + var defaultSeries string + if r.bundle.Series != "" { + defaultSeries = r.bundle.Series + } else if r.bundle.DefaultBase != "" { + var err error + if defaultSeries, err = baseToSeries(r.bundle.DefaultBase); err != nil { + return nil, errors.Trace(err) + } + } existing := r.model charms := make(map[string]string, len(applications)) @@ -405,12 +414,21 @@ func equalStringSlice(a, b []string) bool { // handleMachines populates the change set with "addMachines" records. // This function also handles adding machine annotations. -func (r *resolver) handleMachines() map[string]*AddMachineChange { +func (r *resolver) handleMachines() (map[string]*AddMachineChange, error) { add := r.changes.add machines := r.bundle.Machines - defaultSeries := r.bundle.Series existing := r.model + var defaultSeries string + if r.bundle.Series != "" { + defaultSeries = r.bundle.Series + } else if r.bundle.DefaultBase != "" { + var err error + if defaultSeries, err = baseToSeries(r.bundle.DefaultBase); err != nil { + return nil, errors.Trace(err) + } + } + addedMachines := make(map[string]*AddMachineChange, len(machines)) // Iterate over the map using its sorted keys so that results are // deterministic and easier to test. @@ -427,11 +445,15 @@ func (r *resolver) handleMachines() map[string]*AddMachineChange { if machine == nil { machine = &charm.MachineSpec{} } - series := machine.Series - if series == "" { - series = defaultSeries + series := defaultSeries + if machine.Series != "" { + series = machine.Series + } else if machine.Base != "" { + var err error + if series, err = baseToSeries(machine.Base); err != nil { + return nil, errors.Trace(err) + } } - var id string var target string var requires []string @@ -469,7 +491,7 @@ func (r *resolver) handleMachines() map[string]*AddMachineChange { }, requires...)) } } - return addedMachines + return addedMachines, nil } // handleRelations populates the change set with "addRelation" records. @@ -1140,11 +1162,22 @@ func (r *resolver) handleUnits(addedApplications map[string]string, addedMachine machChangeIDs.Add(v.Id()) } + var defaultSeries string + if r.bundle.Series != "" { + defaultSeries = r.bundle.Series + } else if r.bundle.DefaultBase != "" { + var err error + defaultSeries, err = baseToSeries(r.bundle.DefaultBase) + if err != nil { + return errors.Trace(err) + } + } + processor := &unitProcessor{ add: r.changes.add, existing: r.model, bundle: r.bundle, - defaultSeries: r.bundle.Series, + defaultSeries: defaultSeries, logger: r.logger, addedApplications: addedApplications, addedMachines: addedMachines, @@ -1260,6 +1293,9 @@ func getSeries(application *charm.ApplicationSpec, defaultSeries string) (string if application.Series != "" { return application.Series, nil } + if application.Base != "" { + return baseToSeries(application.Base) + } // Handle local charm paths. if charm.IsValidLocalCharmOrBundlePath(application.Charm) { @@ -1295,6 +1331,18 @@ func getSeries(application *charm.ApplicationSpec, defaultSeries string) (string return defaultSeries, nil } +func baseToSeries(b string) (string, error) { + base, err := corebase.ParseBaseFromString(b) + if err != nil { + return "", errors.Trace(err) + } + series, err := corebase.GetSeriesFromBase(base) + if err != nil { + return "", errors.Trace(err) + } + return series, nil +} + // parseEndpoint creates an endpoint from its string representation. func parseEndpoint(e string) *endpoint { parts := strings.SplitN(e, ":", 2) From c8e01a93f4e43a4467c604a1126746e3130b0d10 Mon Sep 17 00:00:00 2001 From: Jack Shaw Date: Fri, 11 Aug 2023 11:14:27 +0100 Subject: [PATCH 4/7] Allow series and base in bundles if they match Add a verification step into the client to ensure that series and base match. As such, we can treat series and bases as equivalent when they show up precedence-wise. Immidately combine into a base in core. As a helpful side effect, this means we can minimise our dealing with series in this part of the code, which will make it very easy to remove completely Drop changes to core/bundle/changes/handlers.go in cherry-pick since we are sticking with series in transit in 3.1 --- cmd/juju/application/bundle/bundle.go | 68 +++++++++++- cmd/juju/application/bundle/bundle_test.go | 118 ++++++++++++++++++--- core/bundle/changes/handlers.go | 7 +- 3 files changed, 169 insertions(+), 24 deletions(-) diff --git a/cmd/juju/application/bundle/bundle.go b/cmd/juju/application/bundle/bundle.go index deb3a258ebd1..0286fde7e146 100644 --- a/cmd/juju/application/bundle/bundle.go +++ b/cmd/juju/application/bundle/bundle.go @@ -4,6 +4,7 @@ package bundle import ( + "fmt" "reflect" "sort" "strings" @@ -299,6 +300,16 @@ func verifyBundle(data *charm.BundleData, bundleDir string) error { _, err := devices.ParseConstraints(s) return err } + + var errs []string + // This method cannot be included within data.Verify because + // to verify corresponding series and base match we need to be + // able to compare them. The charm package, however, treats bases + // and series generically and is unable to do this. + if err := verifyMixedSeriesBasesMatch(data); err != nil { + errs = append(errs, err.Error()) + } + var verifyError error if bundleDir == "" { verifyError = data.Verify(verifyConstraints, verifyStorage, verifyDevices) @@ -307,11 +318,62 @@ func verifyBundle(data *charm.BundleData, bundleDir string) error { } if verr, ok := errors.Cause(verifyError).(*charm.VerificationError); ok { - errs := make([]string, len(verr.Errors)) - for i, err := range verr.Errors { - errs[i] = err.Error() + for _, err := range verr.Errors { + errs = append(errs, err.Error()) } return errors.New("the provided bundle has the following errors:\n" + strings.Join(errs, "\n")) } return errors.Trace(verifyError) } + +func verifyMixedSeriesBasesMatch(data *charm.BundleData) error { + if data == nil { + return nil + } + if data.Series != "" && data.DefaultBase != "" { + b, err := corebase.ParseBaseFromString(data.DefaultBase) + if err != nil { + return errors.Trace(err) + } + s, err := corebase.GetSeriesFromBase(b) + if err != nil { + return errors.Trace(err) + } + if s != data.Series { + return errors.NewNotValid(nil, fmt.Sprintf("bundle series %q and base %q must match if both supplied", data.Series, data.DefaultBase)) + } + } + + for name, m := range data.Machines { + if m != nil && m.Series != "" && m.Base != "" { + b, err := corebase.ParseBaseFromString(m.Base) + if err != nil { + return errors.Trace(err) + } + s, err := corebase.GetSeriesFromBase(b) + if err != nil { + return errors.Trace(err) + } + if s != m.Series { + return errors.NewNotValid(nil, fmt.Sprintf("machine %q series %q and base %q must match if both supplied", name, m.Series, m.Base)) + } + } + } + + for name, app := range data.Applications { + if app != nil && app.Series != "" && app.Base != "" { + b, err := corebase.ParseBaseFromString(app.Base) + if err != nil { + return errors.Trace(err) + } + s, err := corebase.GetSeriesFromBase(b) + if err != nil { + return errors.Trace(err) + } + if s != app.Series { + return errors.NewNotValid(nil, fmt.Sprintf("application %q series %q and base %q must match if both supplied", name, app.Series, app.Base)) + } + } + } + return nil +} diff --git a/cmd/juju/application/bundle/bundle_test.go b/cmd/juju/application/bundle/bundle_test.go index a93355529307..5726fa2a2700 100644 --- a/cmd/juju/application/bundle/bundle_test.go +++ b/cmd/juju/application/bundle/bundle_test.go @@ -107,13 +107,13 @@ func (s *buildModelRepSuite) TestBuildModelRepresentationApplicationsWithSubordi Name: "default", }, Machines: map[string]params.MachineStatus{ - "0": {Base: params.Base{Name: "ubuntu", Channel: "18.04"}}, - "1": {Base: params.Base{Name: "ubuntu", Channel: "18.04"}}, + "0": {Base: params.Base{Name: "ubuntu", Channel: "22.04"}}, + "1": {Base: params.Base{Name: "ubuntu", Channel: "22.04"}}, }, Applications: map[string]params.ApplicationStatus{ "wordpress": { Charm: "wordpress", - Base: params.Base{Name: "ubuntu", Channel: "18.04"}, + Base: params.Base{Name: "ubuntu", Channel: "22.04"}, Life: life.Alive, Units: map[string]params.UnitStatus{ "0": {Machine: "0"}, @@ -121,7 +121,7 @@ func (s *buildModelRepSuite) TestBuildModelRepresentationApplicationsWithSubordi }, "sub": { Charm: "sub", - Base: params.Base{Name: "ubuntu", Channel: "18.04"}, + Base: params.Base{Name: "ubuntu", Channel: "22.04"}, Life: life.Alive, SubordinateTo: []string{"wordpress"}, }, @@ -263,6 +263,30 @@ func (s *composeAndVerifyRepSuite) TestComposeAndVerifyBundleOverlayUnmarshallEr c.Assert(unmarshallErrors[0], gc.Equals, expectedError) } +func (s *composeAndVerifyRepSuite) TestComposeAndVerifyBundleMixingBaseAndSeries(c *gc.C) { + defer s.setupMocks(c).Finish() + bundleData, err := charm.ReadBundleData(strings.NewReader(mixedSeriesBaseBundle)) + c.Assert(err, jc.ErrorIsNil) + s.expectParts(&charm.BundleDataPart{Data: bundleData}) + s.expectBasePath() + + obtained, _, err := ComposeAndVerifyBundle(s.bundleDataSource, nil) + c.Assert(err, jc.ErrorIsNil) + c.Assert(obtained, gc.DeepEquals, bundleData) +} + +func (s *composeAndVerifyRepSuite) TestComposeAndVerifyBundleMixingBaseAndSeriesMisMatch(c *gc.C) { + defer s.setupMocks(c).Finish() + bundleData, err := charm.ReadBundleData(strings.NewReader(mixedSeriesBaseBundleMismatch)) + c.Assert(err, jc.ErrorIsNil) + s.expectParts(&charm.BundleDataPart{Data: bundleData}) + s.expectBasePath() + + obtained, _, err := ComposeAndVerifyBundle(s.bundleDataSource, nil) + c.Assert(err, gc.ErrorMatches, `(?s)the provided bundle has the following errors:.*application "wordpress" series "jammy" and base "ubuntu@20.04" must match if both supplied.*invalid constraints.*`) + c.Assert(obtained, gc.IsNil) +} + func (s *composeAndVerifyRepSuite) setupOverlayFile(c *gc.C) { s.overlayDir = c.MkDir() s.overlayFile = filepath.Join(s.overlayDir, "config.yaml") @@ -294,12 +318,12 @@ func (s *buildModelRepSuite) TestBuildModelRepresentationApplicationsWithExposed Name: "default", }, Machines: map[string]params.MachineStatus{ - "0": {Base: params.Base{Name: "ubuntu", Channel: "18.04"}}, + "0": {Base: params.Base{Name: "ubuntu", Channel: "22.04"}}, }, Applications: map[string]params.ApplicationStatus{ "wordpress": { Charm: "wordpress", - Base: params.Base{Name: "ubuntu", Channel: "18.04"}, + Base: params.Base{Name: "ubuntu", Channel: "22.04"}, Life: life.Alive, Units: map[string]params.UnitStatus{ "0": {Machine: "0"}, @@ -375,13 +399,13 @@ func (m stringSliceMatcher) String() string { } const wordpressBundle = ` -series: bionic +default-base: ubuntu@22.04 applications: mysql: charm: ch:mysql revision: 42 channel: stable - series: xenial + base: ubuntu@20.04 num_units: 1 to: - "0" @@ -389,28 +413,27 @@ applications: charm: ch:wordpress channel: stable revision: 47 - series: xenial + base: ubuntu@20.04 num_units: 1 to: - "1" machines: "0": - series: xenial + base: ubuntu@20.04 "1": - series: xenial + base: ubuntu@20.04 relations: - - wordpress:db - mysql:db ` const typoBundle = ` -sries: bionic +sries: jammy applications: mysql: charm: ch:mysql revision: 42 channel: stable - series: xenial num_units: 1 to: - "0" @@ -418,16 +441,79 @@ applications: charm: ch:wordpress channel: stable revision: 47 - series: xenial num_units: 1 to: - "1" machines: "0": - series: xenial constrai: arch=arm64 "1": - series: xenial +relations: +- - wordpress:db + - mysql:db +` + +const mixedSeriesBaseBundle = ` +series: jammy +default-base: ubuntu@22.04 +applications: + mysql: + charm: ch:mysql + revision: 42 + channel: stable + series: focal + base: ubuntu@20.04 + num_units: 1 + to: + - "0" + wordpress: + charm: ch:wordpress + channel: stable + revision: 47 + series: jammy + num_units: 1 + to: + - "1" +machines: + "0": + series: focal + base: ubuntu@20.04 + "1": + series: jammy +relations: +- - wordpress:db + - mysql:db +` + +const mixedSeriesBaseBundleMismatch = ` +series: jammy +default-base: ubuntu@22.04 +applications: + mysql: + charm: ch:mysql + revision: 42 + channel: stable + series: focal + base: ubuntu@20.04 + num_units: 1 + constraints: image-id=ubuntu-bf2 + to: + - "0" + wordpress: + charm: ch:wordpress + channel: stable + revision: 47 + series: jammy + base: ubuntu@20.04 + num_units: 1 + to: + - "1" +machines: + "0": + series: focal + base: ubuntu@20.04 + "1": + series: jammy relations: - - wordpress:db - mysql:db diff --git a/core/bundle/changes/handlers.go b/core/bundle/changes/handlers.go index 4db0f0b131a3..f69ac4685512 100644 --- a/core/bundle/changes/handlers.go +++ b/core/bundle/changes/handlers.go @@ -33,6 +33,7 @@ type resolver struct { func (r *resolver) handleApplications() (map[string]string, error) { add := r.changes.add applications := r.bundle.Applications + existing := r.model var defaultSeries string if r.bundle.Series != "" { @@ -43,7 +44,6 @@ func (r *resolver) handleApplications() (map[string]string, error) { return nil, errors.Trace(err) } } - existing := r.model charms := make(map[string]string, len(applications)) addedApplications := make(map[string]string, len(applications)) @@ -1286,7 +1286,7 @@ func applicationKey(charm, arch, series, channel string, revision int) string { } // getSeries retrieves the series of a application from the ApplicationSpec or from the -// charm path or URL if provided, otherwise falling back on a default series. +// charm path or URL if provided. // // DEPRECATED: This should be all about bases. func getSeries(application *charm.ApplicationSpec, defaultSeries string) (string, error) { @@ -1297,7 +1297,6 @@ func getSeries(application *charm.ApplicationSpec, defaultSeries string) (string return baseToSeries(application.Base) } - // Handle local charm paths. if charm.IsValidLocalCharmOrBundlePath(application.Charm) { _, charmURL, err := corecharm.NewCharmAtPath(application.Charm, defaultSeries) if corecharm.IsMissingSeriesError(err) { @@ -1315,8 +1314,6 @@ func getSeries(application *charm.ApplicationSpec, defaultSeries string) (string return charmURL.Series, nil } - // The following is safe because the bundle data is assumed to be already - // verified, and therefore this must be a valid charm URL. charmURL, err := charm.ParseURL(application.Charm) if err != nil { return "", errors.Trace(err) From 988ab5d17d5beb54ced7ed63956bbb339b1927f3 Mon Sep 17 00:00:00 2001 From: Jordan Barrett Date: Thu, 31 Aug 2023 14:53:10 +0700 Subject: [PATCH 5/7] [try-merge] add logs link - checkout source branch - refactor with templates --- .github/workflows/merge.yml | 8 +++++--- scripts/try-merge/main.go | 31 +++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 444c76995e14..1d782d92dff9 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - ref: ${{ steps.branch.outputs.target }} + ref: ${{ steps.branch.outputs.source }} - name: Set up Go uses: actions/setup-go@v4 @@ -46,15 +46,17 @@ jobs: id: merge env: SOURCE_BRANCH: ${{ steps.branch.outputs.source }} + TARGET_BRANCH: ${{ steps.branch.outputs.target }} run: | set -x - git fetch origin "$SOURCE_BRANCH" - git branch "$SOURCE_BRANCH" "origin/$SOURCE_BRANCH" + git fetch origin "$TARGET_BRANCH" + git branch "$TARGET_BRANCH" "origin/$TARGET_BRANCH" # Need to set Git username/email to do the merge (yawn) git config user.name 'jujubot' git config user.email 'fake@address.me' set +e + git switch "$TARGET_BRANCH" git merge "$SOURCE_BRANCH" case $? in 0) diff --git a/scripts/try-merge/main.go b/scripts/try-merge/main.go index f80630ff8000..e0df68f4b1db 100644 --- a/scripts/try-merge/main.go +++ b/scripts/try-merge/main.go @@ -8,6 +8,7 @@ import ( "fmt" "os" "strings" + "text/template" "github.com/juju/collections/set" ) @@ -109,17 +110,9 @@ func printErrMsg() { } } - // If no-one to notify: don't send a message - if peopleToNotify.IsEmpty() { - return + if !peopleToNotify.IsEmpty() { + printMessage(peopleToNotify) } - - // Construct the message - taggedUsers := strings.Join(peopleToNotify.Values(), ", ") - message := fmt.Sprintf( - "%[1]s: your recent changes to `%[2]s` have caused merge conflicts. Please merge `%[2]s` into `%[3]s` and resolve the conflicts.", - taggedUsers, sourceBranch, targetBranch) - stdoutf(message) } // findOffendingCommits returns a list of commits that may be causing merge @@ -199,6 +192,24 @@ func commitHasOpenPR(commit commitInfo) (prNumber int, ok bool) { return -1, false } +func printMessage(peopleToNotify set.Strings) { + messageData := struct{ TaggedUsers, SourceBranch, TargetBranch, LogsLink string }{ + TaggedUsers: strings.Join(peopleToNotify.Values(), ", "), + SourceBranch: sourceBranch, + TargetBranch: targetBranch, + LogsLink: fmt.Sprintf("https://github.com/%s/actions/runs/%s", + os.Getenv("GITHUB_REPOSITORY"), os.Getenv("GITHUB_RUN_ID")), + } + + tmpl, err := template.New("test").Parse( + "{{.TaggedUsers}}: your recent changes to `{{.SourceBranch}}` have caused merge conflicts. " + + "Please merge `{{.SourceBranch}}` into `{{.TargetBranch}}` and resolve the conflicts." + + "[[logs]({{.LogsLink}})]", + ) + check(err) + check(tmpl.Execute(os.Stdout, messageData)) +} + func check(err error) { if err != nil { stderrf("%#v\n", err) From 34659f73a83a46126aa2554f2c58a1ed4d1495b7 Mon Sep 17 00:00:00 2001 From: Jordan Barrett Date: Thu, 31 Aug 2023 16:36:55 +0700 Subject: [PATCH 6/7] [try-merge] remove unused stdoutf function --- scripts/try-merge/main.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/try-merge/main.go b/scripts/try-merge/main.go index e0df68f4b1db..9321c863b2cc 100644 --- a/scripts/try-merge/main.go +++ b/scripts/try-merge/main.go @@ -217,12 +217,6 @@ func check(err error) { } } -// Print to stdout. Only the actual result should go here (the generated -// notification message). -func stdoutf(f string, v ...any) { - _, _ = fmt.Fprintf(os.Stdout, f, v...) -} - // Print to stderr. Logging/debug info should go here, so that it is kept // separate from the actual output. func stderrf(f string, v ...any) { From 7fc88d6a20e8d358892815b8f1b96b9c94eed509 Mon Sep 17 00:00:00 2001 From: Jordan Barrett Date: Thu, 31 Aug 2023 16:37:54 +0700 Subject: [PATCH 7/7] [generate] go mod tidy before diff --- .github/workflows/gen.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/gen.yml b/.github/workflows/gen.yml index 8d6bcaf1351e..9e9a88fd75e8 100644 --- a/.github/workflows/gen.yml +++ b/.github/workflows/gen.yml @@ -46,6 +46,9 @@ jobs: if: success() || failure() shell: bash run: | + # The generation sometimes adds things to go.sum. Tidy to remove these. + go mod tidy + git add -A if [[ -n $(git diff HEAD) ]]; then echo "*****"