Upgrade to go-control-plane v0.10.1

controllers/marin3r/envoyconfig_controller_suite_test.go

@@ -114,15 +114,16 @@ var _ = Describe("EnvoyConfig controller", func() {
 				// Validate the cache for the nodeID
 				wantRevision := util.Hash(ec.Spec.EnvoyResources)
 				wantSnap := xdss_v3.NewSnapshot(&cache_v3.Snapshot{
-					Resources: [7]cache_v3.Resources{
-						{Version: "845f965864", Items: map[string]cache_types.ResourceWithTtl{
+					Resources: [8]cache_v3.Resources{
+						{Version: "845f965864", Items: map[string]cache_types.ResourceWithTTL{
 							"endpoint": {Resource: &envoy_config_endpoint_v3.ClusterLoadAssignment{ClusterName: "endpoint"}}}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
 					}})
 
 				// Wait for the revision to get written to the xDS cache

controllers/marin3r/envoyconfigrevision_controller.go

@@ -112,7 +112,7 @@ func (r *EnvoyConfigRevisionReconciler) Reconcile(ctx context.Context, req ctrl.
 			envoy_resources.NewGenerator(r.APIVersion),
 		)
 
-		vt, err = cacheReconciler.Reconcile(req.NamespacedName, ecr.Spec.EnvoyResources, ecr.Spec.NodeID, ecr.Spec.Version)
+		vt, err = cacheReconciler.Reconcile(ctx, req.NamespacedName, ecr.Spec.EnvoyResources, ecr.Spec.NodeID, ecr.Spec.Version)
 
 		// If a type errors.StatusError is returned it means that the config in spec.envoyResources is wrong
 		// and cannot be written into the xDS cache. This is true for any error loading all types of resources

controllers/marin3r/envoyconfigrevision_controller_suite_test.go

@@ -132,15 +132,16 @@ var _ = Describe("EnvoyConfigRevision controller", func() {
 				}, 60*time.Second, 5*time.Second).ShouldNot(HaveOccurred())
 
 				wantSnap := xdss_v3.NewSnapshot(&cache_v3.Snapshot{
-					Resources: [7]cache_v3.Resources{
-						{Version: "845f965864", Items: map[string]cache_types.ResourceWithTtl{
+					Resources: [8]cache_v3.Resources{
+						{Version: "845f965864", Items: map[string]cache_types.ResourceWithTTL{
 							"endpoint": {Resource: &envoy_config_endpoint_v3.ClusterLoadAssignment{ClusterName: "endpoint"}}}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
 					}})
 				Expect(testutil.SnapshotsAreEqual(gotV3Snap, wantSnap)).To(BeTrue())
 
@@ -194,13 +195,14 @@ var _ = Describe("EnvoyConfigRevision controller", func() {
 			Expect(ecr.Status.Conditions.IsTrueFor(marin3rv1alpha1.RevisionPublishedCondition)).To(BeTrue())
 
 			wantSnap := xdss_v3.NewSnapshot(&cache_v3.Snapshot{
-				Resources: [7]cache_v3.Resources{
-					{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-					{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-					{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-					{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
+				Resources: [8]cache_v3.Resources{
+					{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+					{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+					{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+					{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+					{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
 					{
-						Version: "56c6b8dc45", Items: map[string]cache_types.ResourceWithTtl{
+						Version: "56c6b8dc45", Items: map[string]cache_types.ResourceWithTTL{
 							"secret": {Resource: &envoy_extensions_transport_sockets_tls_v3.Secret{
 								Name: "secret",
 								Type: &envoy_extensions_transport_sockets_tls_v3.Secret_TlsCertificate{
@@ -211,8 +213,8 @@ var _ = Describe("EnvoyConfigRevision controller", func() {
 										CertificateChain: &envoy_config_core_v3.DataSource{
 											Specifier: &envoy_config_core_v3.DataSource_InlineBytes{InlineBytes: []byte("cert")},
 										}}}}}}},
-					{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-					{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
+					{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+					{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
 				}})
 
 			By("waiting for the envoy resources to be published in the xDS cache")
@@ -221,6 +223,7 @@ var _ = Describe("EnvoyConfigRevision controller", func() {
 				if err != nil {
 					return false
 				}
+				// spew.Dump(gotV3Snap)
 				return testutil.SnapshotsAreEqual(gotV3Snap, wantSnap)
 			}, 60*time.Second, 5*time.Second).Should(BeTrue())
 		})
@@ -243,13 +246,14 @@ var _ = Describe("EnvoyConfigRevision controller", func() {
 				}, 60*time.Second, 5*time.Second).Should(BeTrue())
 
 				wantSnap := xdss_v3.NewSnapshot(&cache_v3.Snapshot{
-					Resources: [7]cache_v3.Resources{
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
+					Resources: [8]cache_v3.Resources{
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
 						{
-							Version: "66bb868d4f", Items: map[string]cache_types.ResourceWithTtl{
+							Version: "66bb868d4f", Items: map[string]cache_types.ResourceWithTTL{
 								"secret": {Resource: &envoy_extensions_transport_sockets_tls_v3.Secret{
 									Name: "secret",
 									Type: &envoy_extensions_transport_sockets_tls_v3.Secret_TlsCertificate{
@@ -260,8 +264,8 @@ var _ = Describe("EnvoyConfigRevision controller", func() {
 											CertificateChain: &envoy_config_core_v3.DataSource{
 												Specifier: &envoy_config_core_v3.DataSource_InlineBytes{InlineBytes: []byte("new-cert")},
 											}}}}}}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
-						{Version: "", Items: map[string]cache_types.ResourceWithTtl{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
+						{Version: "", Items: map[string]cache_types.ResourceWithTTL{}},
 					}})
 
 				By("checking the new certificate it's in the xDS cache")

generators/pkg-envoy-proto/main.go

@@ -108,7 +108,7 @@ func listProtoPackages(version string) []string {
 		dir, filename := filepath.Split(f.Name)
 		dir = filepath.Clean(dir)
 		// Look only under path "envoy/"
-		if !strings.HasPrefix(dir, "envoy/") {
+		if !strings.HasPrefix(dir, "envoy/") && !strings.HasPrefix(dir, "contrib/envoy/") {
 			return nil
 		}
 		// Find all proto files for the specified API version

go.mod

@@ -5,27 +5,25 @@ go 1.16
 require (
 	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/davecgh/go-spew v1.1.1
-	github.com/envoyproxy/go-control-plane v0.9.9
+	github.com/envoyproxy/go-control-plane v0.10.1
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-logr/logr v0.4.0
 	github.com/go-test/deep v1.0.8
-	github.com/golang/protobuf v1.5.2
 	github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.17.0
 	github.com/operator-framework/operator-lib v0.1.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
 	github.com/prometheus/common v0.31.1
-	github.com/redhat-cop/operator-utils v1.3.2
+	github.com/redhat-cop/operator-utils v0.0.0-20220124141339-856c7a8860e5
 	github.com/spf13/cobra v1.2.1
 	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
 	google.golang.org/grpc v1.38.0
+	google.golang.org/protobuf v1.27.1
 	k8s.io/api v0.22.1
 	k8s.io/apimachinery v0.22.1
 	k8s.io/client-go v0.22.1
 	k8s.io/utils v0.0.0-20210802155522-efc7438f0176
 	sigs.k8s.io/controller-runtime v0.10.0
 )
-
-replace github.com/redhat-cop/operator-utils v1.3.2 => github.com/roivaz/operator-utils v0.0.0-20220121121047-9e3c33505230

go.sum

@@ -120,8 +120,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed h1:OZmjad4L3H8ncOIR8rnb5MREYqG8ixi5+WbeUsquF0c=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe h1:QJDJubh0OEcpeGjC7/8uF9tt4e39U/Ya1uyK+itnNPQ=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
 github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
@@ -168,8 +168,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9 h1:vQLjymTobffN2R0F8eTqw6q7iozfRO5Z0m+/4Vw+/uA=
-github.com/envoyproxy/go-control-plane v0.9.9/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
+github.com/envoyproxy/go-control-plane v0.10.1 h1:cgDRLG7bs59Zd+apAWuzLQL95obVYAymNJek76W3mgw=
+github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
@@ -561,11 +561,11 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/redhat-cop/operator-utils v0.0.0-20220124141339-856c7a8860e5 h1:OmbZyVu9ABp8pyVc47QfORLhBToDIEHD2BIxgujAJhE=
+github.com/redhat-cop/operator-utils v0.0.0-20220124141339-856c7a8860e5/go.mod h1:FfTyeSCu+e2VLgeMh/1RFG8TSkVjKRPEyR6EmDt0RIw=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/roivaz/operator-utils v0.0.0-20220121121047-9e3c33505230 h1:3tELwlBUAWfyBzG9N74hRZXLg+0bVc5F7FRPUiIO65k=
-github.com/roivaz/operator-utils v0.0.0-20220121121047-9e3c33505230/go.mod h1:FfTyeSCu+e2VLgeMh/1RFG8TSkVjKRPEyR6EmDt0RIw=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
@@ -670,6 +670,7 @@ go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m
 go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE=
 go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE=
 go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw=
+go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -1088,8 +1089,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

pkg/discoveryservice/xdss/interface.go

@@ -1,6 +1,8 @@
 package discoveryservice
 
 import (
+	"context"
+
 	envoy "github.com/3scale-ops/marin3r/pkg/envoy"
 )
 
@@ -13,7 +15,7 @@ import (
 // to ensure that Envoy makes the request for all EDS clusters or RDS routes
 // eventually.
 type Cache interface {
-	SetSnapshot(string, Snapshot) error
+	SetSnapshot(context.Context, string, Snapshot) error
 	GetSnapshot(string) (Snapshot, error)
 	ClearSnapshot(string)
 	NewSnapshot(string) Snapshot

pkg/discoveryservice/xdss/v3/cache.go

@@ -1,6 +1,8 @@
 package discoveryservice
 
 import (
+	"context"
+
 	xdss "github.com/3scale-ops/marin3r/pkg/discoveryservice/xdss"
 	cache_types "github.com/envoyproxy/go-control-plane/pkg/cache/types"
 	cache_v3 "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
@@ -17,9 +19,9 @@ func NewCache(v3 cache_v3.SnapshotCache) Cache {
 }
 
 // SetSnapshot updates a snapshot for a node.
-func (c Cache) SetSnapshot(nodeID string, snap xdss.Snapshot) error {
+func (c Cache) SetSnapshot(ctx context.Context, nodeID string, snap xdss.Snapshot) error {
 
-	return c.v3.SetSnapshot(nodeID, *snap.(Snapshot).v3)
+	return c.v3.SetSnapshot(ctx, nodeID, *snap.(Snapshot).v3)
 }
 
 // GetSnapshot gets the snapshot for a node, and returns an error if not found.
@@ -41,11 +43,12 @@ func (c Cache) ClearSnapshot(nodeID string) {
 // NewSnapshot returns a Snapshot object
 func (c Cache) NewSnapshot(resourcesVersion string) xdss.Snapshot {
 
-	snap := &cache_v3.Snapshot{Resources: [7]cache_v3.Resources{}}
+	snap := &cache_v3.Snapshot{Resources: [8]cache_v3.Resources{}}
 	snap.Resources[cache_types.Listener] = cache_v3.NewResources(resourcesVersion, []cache_types.Resource{})
 	snap.Resources[cache_types.Endpoint] = cache_v3.NewResources(resourcesVersion, []cache_types.Resource{})
 	snap.Resources[cache_types.Cluster] = cache_v3.NewResources(resourcesVersion, []cache_types.Resource{})
 	snap.Resources[cache_types.Route] = cache_v3.NewResources(resourcesVersion, []cache_types.Resource{})
+	snap.Resources[cache_types.ScopedRoute] = cache_v3.NewResources(resourcesVersion, []cache_types.Resource{})
 	snap.Resources[cache_types.Secret] = cache_v3.NewResources(resourcesVersion, []cache_types.Resource{})
 	snap.Resources[cache_types.Runtime] = cache_v3.NewResources(resourcesVersion, []cache_types.Resource{})
 	snap.Resources[cache_types.ExtensionConfig] = cache_v3.NewResources(resourcesVersion, []cache_types.Resource{})