Merge ~woutervb/snap-store-proxy-charm:rename_to_snap-store-proxy into snap-store-proxy-charm:master

Proposed by Wouter van Bommel
Status: Merged
Approved by: Wouter van Bommel
Approved revision: d1c0d2bc5228011504933bacb2a0b5fc71224cac
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~woutervb/snap-store-proxy-charm:rename_to_snap-store-proxy
Merge into: snap-store-proxy-charm:master
Diff against target: 99 lines (+12/-12)
5 files modified
README.md (+2/-2)
docs/snap-store-proxy docs - index.md (+3/-3)
docs/snap-store-proxy docs - install.md (+5/-5)
docs/snap-store-proxy docs - upgrading.md (+1/-1)
metadata.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Przemysław Suliga Approve
Review via email: mp+419423@code.launchpad.net

Commit message

Remove the -charm suffix where appropriate

To post a comment you must log in.
Revision history for this message
Przemysław Suliga (suligap) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index 3ee0ad3..c48ebef 100644
3--- a/README.md
4+++ b/README.md
5@@ -1,4 +1,4 @@
6-# snap-store-proxy-charm
7+# snap-store-proxy
8
9 ## Description
10
11@@ -17,7 +17,7 @@ Below is a minimal bundle example that can be used to deploy the charm using juj
12 charm: postgresql
13 channel: stable
14 snap-store-proxy:
15- charm: snap-store-proxy-charm
16+ charm: cs:snap-store-proxy
17 options:
18 registration_bundle: <content of registration file>
19
20diff --git a/docs/snap-store-proxy docs - index.md b/docs/snap-store-proxy docs - index.md
21index 7d9f7dd..c5dcde1 100644
22--- a/docs/snap-store-proxy docs - index.md
23+++ b/docs/snap-store-proxy docs - index.md
24@@ -3,9 +3,9 @@ A charm that install the snap-store-proxy snap
25 To get started, deploy the charm in a test environment as follows:
26
27 juju deploy postgresql
28- juju deploy snap-store-proxy-charm
29- juju relate postgresql:db-admin snap-store-proxy-charm:db-admin
30- juju config snap-store-proxy-charm registration_bundle=\
31+ juju deploy snap-store-proxy
32+ juju relate postgresql:db-admin snap-store-proxy:db-admin
33+ juju config snap-store-proxy registration_bundle=\
34 $(cat <registration bundle>)
35
36 For more information on how to obtain a registration bundle [see here](https://snapcraft.io/store-admin).
37diff --git a/docs/snap-store-proxy docs - install.md b/docs/snap-store-proxy docs - install.md
38index e924349..5b2a03c 100644
39--- a/docs/snap-store-proxy docs - install.md
40+++ b/docs/snap-store-proxy docs - install.md
41@@ -4,10 +4,10 @@ obtained via the snap `store-admin`.
42
43 The charm can be installed in two ways. The preferred way is to use the
44 snap-store itself, which means that the machine instances on which the
45-`snap-store-proxy-charm` is installed, needs to be to connect to the store.
46+`snap-store-proxy` is installed, needs to be to connect to the store.
47
48 The other way is, to download the `snap-store-proxy*.snap` and the
49-`core20-*.snap` and attach these as resources to the `snap-store-proxy-charm`
50+`core20-*.snap` and attach these as resources to the `snap-store-proxy`
51 during installation. After installation a resource can be updates via juju,
52 by attaching a newer resource. This will be the only way to update the charm.
53
54@@ -19,11 +19,11 @@ An example juju-bundle, that can be used for installation:
55
56 applications:
57 postgresql:
58- charm: ch:postgresql
59+ charm: postgresql
60 channel: stable
61 num_units: 1
62 snap-store-proxy:
63- charm: ch:snap-store-proxy-charm
64+ charm: snap-store-proxy
65 num_units: 1
66
67 relations:
68@@ -39,7 +39,7 @@ can be used for installation.
69
70 applications:
71 postgresql:
72- charm: ch:postgresql
73+ charm: postgresql
74 channel: stable
75 num_units: 1
76 snap-store-proxy:
77diff --git a/docs/snap-store-proxy docs - upgrading.md b/docs/snap-store-proxy docs - upgrading.md
78index f1ddcce..04fad55 100644
79--- a/docs/snap-store-proxy docs - upgrading.md
80+++ b/docs/snap-store-proxy docs - upgrading.md
81@@ -11,4 +11,4 @@ updated manually.
82 Upgrading the charm is done via juju, it is simply a matter of running the
83 [juju command to upgrade applications](https://juju.is/docs/upgrading-applications)
84
85- juju refresh snap-store-proxy-charm
86+ juju refresh snap-store-proxy
87diff --git a/metadata.yaml b/metadata.yaml
88index 9981632..3854c53 100644
89--- a/metadata.yaml
90+++ b/metadata.yaml
91@@ -12,7 +12,7 @@ maintainers:
92 - Wouter van Bommel <wouter.bommel>@canonical.com
93 tags:
94 - Snap store proxy
95- - snap-store-proxy-charm
96+ - snap-store-proxy
97 docs: https://discourse.charmhub.io/t/snap-store-proxy-docs-index/6151
98
99 subordinate: false

Subscribers

People subscribed via source and target branches

to all changes: