Remove support for charm store charms the resources package.

Charm store charm support is being removed across juju. A few changes to stop using deprecated methods in the errors package.
addyess · Dec 13, 2022 · 7628d14 · 7628d14
1 parent 7fc3b3f
commit 7628d14
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 217 deletions.
diff --git a/resource/charmstore.go b/resource/charmstore.go
diff --git a/resource/charmstore_test.go b/resource/charmstore_test.go
diff --git a/resource/opener.go b/resource/opener.go
@@ -90,8 +90,6 @@ func newInternalResourceOpener(
 	switch {
 	case charm.CharmHub.Matches(charmURL.Schema):
 		resourceClientGetter = newCharmHubOpener(st)
-	case charm.CharmStore.Matches(charmURL.Schema):
-		resourceClientGetter = newCharmStoreOpener(st)
 	default:
 		// Use the nop opener that performs no store side requests. Instead it
 		// will resort to using the state package only. Any thing else will call
@@ -206,10 +204,6 @@ func (ro ResourceOpener) getResource(resName string, done func()) (_ resources.R
 	// data from charmhub through a new resourceClient and set the data
 	// for the resource in the cache.
 
-	if res.Origin != charmresource.OriginStore {
-		return resources.Resource{}, nil, errors.NotFoundf("resource %q", res.Name)
-	}
-
 	id := CharmID{
 		URL:    ro.charmURL,
 		Origin: ro.charmOrigin,
@@ -247,7 +241,7 @@ func (ro ResourceOpener) get(name string) (resources.Resource, io.ReadCloser, er
 	}
 
 	res, reader, err := ro.open(name)
-	if errors.IsNotFound(err) {
+	if errors.Is(err, errors.NotFound) {
 		reader = nil
 		res, err = ro.resourceCache.GetResource(ro.appName, name)
 	}

diff --git a/resource/retryclient.go b/resource/retryclient.go
@@ -25,7 +25,7 @@ func newRetryClient(client ResourceGetter) *ResourceRetryClient {
 		// (anastasiamac 2017-05-25) This might not work as the error types
 		// may be lost after a call to some clients.
 		IsFatalError: func(err error) bool {
-			return errors.IsNotFound(err) || errors.IsNotValid(err)
+			return errors.Is(err, errors.NotFound) || errors.Is(err, errors.NotValid)
 		},
 		// We don't want to retry for ever.
 		// If we cannot get a resource after trying a few times,