diff --git a/storage/conformance/conformance.go b/storage/conformance/conformance.go index 8a55a75b..1ac51fc8 100644 --- a/storage/conformance/conformance.go +++ b/storage/conformance/conformance.go @@ -591,11 +591,10 @@ func testConnectorCRUD(t *testing.T, s storage.Storage) { id1 := storage.NewID() config1 := []byte(`{"issuer": "https://accounts.google.com"}`) c1 := storage.Connector{ - ID: id1, - Type: "Default", - Name: "Default", - ResourceVersion: "1", - Config: config1, + ID: id1, + Type: "Default", + Name: "Default", + Config: config1, } if err := s.CreateConnector(c1); err != nil { @@ -609,11 +608,10 @@ func testConnectorCRUD(t *testing.T, s storage.Storage) { id2 := storage.NewID() config2 := []byte(`{"redirectURIi": "http://127.0.0.1:5556/dex/callback"}`) c2 := storage.Connector{ - ID: id2, - Type: "Mock", - Name: "Mock", - ResourceVersion: "2", - Config: config2, + ID: id2, + Type: "Mock", + Name: "Mock", + Config: config2, } if err := s.CreateConnector(c2); err != nil { @@ -626,6 +624,8 @@ func testConnectorCRUD(t *testing.T, s storage.Storage) { t.Errorf("get connector: %v", err) return } + // ignore resource version comparison + gr.ResourceVersion = "" if diff := pretty.Compare(want, gr); diff != "" { t.Errorf("connector retrieved from storage did not match: %s", diff) } @@ -650,11 +650,15 @@ func testConnectorCRUD(t *testing.T, s storage.Storage) { t.Errorf("list connectors: %v", err) return } + // ignore resource version comparison + for i := range connectors { + connectors[i].ResourceVersion = "" + } sort.Slice(connectors, func(i, j int) bool { return connectors[i].Name < connectors[j].Name }) if diff := pretty.Compare(want, connectors); diff != "" { - t.Errorf("password list retrieved from storage did not match: %s", diff) + t.Errorf("connector list retrieved from storage did not match: %s", diff) } } listAndCompare(connectorList) diff --git a/storage/kubernetes/types.go b/storage/kubernetes/types.go index 5eda1781..0fbb2907 100644 --- a/storage/kubernetes/types.go +++ b/storage/kubernetes/types.go @@ -595,10 +595,9 @@ type Connector struct { k8sapi.TypeMeta `json:",inline"` k8sapi.ObjectMeta `json:"metadata,omitempty"` - ID string `json:"id,omitempty"` - Type string `json:"type,omitempty"` - Name string `json:"name,omitempty"` - ResourceVersion string `json:"resourceVersion,omitempty"` + ID string `json:"id,omitempty"` + Type string `json:"type,omitempty"` + Name string `json:"name,omitempty"` // Config holds connector specific configuration information Config []byte `json:"config,omitempty"` } @@ -613,11 +612,10 @@ func (cli *client) fromStorageConnector(c storage.Connector) Connector { Name: c.ID, Namespace: cli.namespace, }, - ID: c.ID, - Type: c.Type, - Name: c.Name, - ResourceVersion: c.ResourceVersion, - Config: c.Config, + ID: c.ID, + Type: c.Type, + Name: c.Name, + Config: c.Config, } } @@ -626,7 +624,7 @@ func toStorageConnector(c Connector) storage.Connector { ID: c.ID, Type: c.Type, Name: c.Name, - ResourceVersion: c.ResourceVersion, + ResourceVersion: c.ObjectMeta.ResourceVersion, Config: c.Config, } }