Skip to content

Drop curl.Series check #16595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
jujubot merged 1 commit into from
Nov 21, 2023
Merged

Drop curl.Series check #16595

jujubot merged 1 commit into from
Nov 21, 2023

Conversation

@jack-w-shaw
Copy link
Member

@jack-w-shaw jack-w-shaw commented Nov 17, 2023 •
edited
Loading

After discussions with @hmlanigan we discovered this check was a leftover remanent from when we used to support charmstore. Since we no longer do so, this part of the check is redundant and can be removed

This will act as a step towards replacing the series part of charm url with a base. Removing un-necessary references to .Series will make this process far easier

Checklist

  • Code style: imports ordered, good names, simple structure, etc
  • [ ] Comments saying why design decisions were made
  • [ ] Go unit tests, with comments saying what you're testing
  • [ ] Integration tests, with comments saying what you're testing
  • [ ] doc.go added or updated in changed packages

QA steps

./main.sh -v refresh

$ mkdir kafka
$ cd kafka
$ juju download kafka
$ unzip kafka_r123.charm
(edit manifest.yaml such that:)
$ cat manifest.yaml
analysis:
  attributes:
  - name: language
    result: python
  - name: framework
    result: operator
bases:
- architectures:
  - amd64
  channel: '20.04'
  name: ubuntu
charmcraft-started-at: '2023-05-23T17:31:52.708211Z'
charmcraft-version: 2.3.0

$ cd ..
$ juju deploy ./kafka
Located local charm "kafka", revision 0
Deploying "kafka" from local charm "kafka", revision 0 on [email protected]/stable

$ juju refresh --switch kafka kafka --channel 3
ERROR cannot upgrade from single base "[email protected]" charm to a charm supporting ["[email protected]"]. Use --force-series to override.

$ juju refresh --switch kafka kafka --channel 3 --force-series
Added charm-hub charm "kafka", revision 123 in channel 3/stable, to the model
no change to endpoints in space "alpha": certificates, cluster, cos-agent, kafka-client, restart, trusted-ca, trusted-certificate, zookeeper

@jack-w-shaw
Drop curl.Series check
9d7d815 
This was left over from charm store and is now no longer required
@jack-w-shaw jack-w-shaw requested review from anvial, hmlanigan and wallyworld and removed request for hmlanigan November 17, 2023 16:55
@hpidcock hpidcock added the 3.4 label Nov 20, 2023
@jack-w-shaw
Copy link
Member Author

jack-w-shaw commented Nov 21, 2023

/merge

1 similar comment
@jack-w-shaw
Copy link
Member Author

jack-w-shaw commented Nov 21, 2023

/merge

@jujubot jujubot merged commit 9a5fa9f into juju:3.4 Nov 21, 2023
@jack-w-shaw jack-w-shaw deleted the remove_unnecessary_curl_series_refresher branch November 21, 2023 13:06
@jack-w-shaw jack-w-shaw mentioned this pull request Nov 22, 2023
Merged
jujubot added a commit that referenced this pull request Nov 24, 2023
@jujubot
Merge pull request #16606 from jack-w-shaw/3.4-into-main
3de2b81 
#16606

Merges:
- #16573
- #16564
- #16561
- #16592
- #16557
- #16593
- #16595
- #16612

Standard version conflicts:
- scripts/win-installer/setup.iss
- snap/snapcraft.yaml
- version/version.go

Conflicts around re-naming DeduceOrigin to MakeOrigin
- cmd/juju/application/refresh_test.go

Conflicts making changes to removed code
- cmd/juju/application/deploy_test.go
- cmd/juju/application/utils/origin.go
- upgrades/upgradevalidation/validation.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wallyworld wallyworld wallyworld approved these changes

@hmlanigan hmlanigan Awaiting requested review from hmlanigan

@anvial anvial Awaiting requested review from anvial

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jack-w-shaw @wallyworld @hpidcock @jujubot