k-space/dex
Archived
11
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

storage/kubernetes: remove shadowed ResourceVersion from Connector (#1673)

Browse Source
This commit is contained in:
Kyle Travis
2020-04-07 05:02:44 -04:00
committed by GitHub
parent f6476b62f2
commit cfae2eb720
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
storage/kubernetes/types.go
View File

@@ -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,
}
}