mirror of
https://github.com/gravitational/teleport.git
synced 2026-11-05 20:27:21 +08:00
rosstimothy
e035f4dbf3
* Set revision on resources retrieved from the backend Adds a new `MarshalOption` that ensures the resource revision is set when unmarshalling a backend item. The new `WithRevision` option was also applied everywhere that the legacy `WithResourceID` was being used. * Prevent storing resource revision in the backend item value The revision follows the same semantics as the resource id for marshalling. This prevents both items from showing up in the value of the backend item, which can prevent compare and swap operations from completing succesfully. Each backend is responsible for persisting the revision in some manner. The existing PreserveResourceID was reused to prevent having to make multiple copies of a resource when clearing the id and revision. The marshal option will be updated in a follow up when the resource id is removed. * Ignore revision in resource comparisons
76 lines
2.0 KiB
Go
76 lines
2.0 KiB
Go
/*
|
|
Copyright 2021 Gravitational, Inc.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package services
|
|
|
|
import (
|
|
"github.com/gravitational/trace"
|
|
|
|
"github.com/gravitational/teleport/api/types"
|
|
"github.com/gravitational/teleport/lib/utils"
|
|
)
|
|
|
|
// MarshalPluginData marshals the PluginData resource to JSON.
|
|
func MarshalPluginData(pluginData types.PluginData, opts ...MarshalOption) ([]byte, error) {
|
|
if err := pluginData.CheckAndSetDefaults(); err != nil {
|
|
return nil, trace.Wrap(err)
|
|
}
|
|
|
|
cfg, err := CollectOptions(opts)
|
|
if err != nil {
|
|
return nil, trace.Wrap(err)
|
|
}
|
|
|
|
switch pluginData := pluginData.(type) {
|
|
case *types.PluginDataV3:
|
|
if !cfg.PreserveResourceID {
|
|
// avoid modifying the original object
|
|
// to prevent unexpected data races
|
|
cp := *pluginData
|
|
cp.SetResourceID(0)
|
|
pluginData = &cp
|
|
}
|
|
return utils.FastMarshal(pluginData)
|
|
default:
|
|
return nil, trace.BadParameter("unrecognized plugin data type: %T", pluginData)
|
|
}
|
|
}
|
|
|
|
// UnmarshalPluginData unmarshals the PluginData resource from JSON.
|
|
func UnmarshalPluginData(raw []byte, opts ...MarshalOption) (types.PluginData, error) {
|
|
cfg, err := CollectOptions(opts)
|
|
if err != nil {
|
|
return nil, trace.Wrap(err)
|
|
}
|
|
var data types.PluginDataV3
|
|
if err := utils.FastUnmarshal(raw, &data); err != nil {
|
|
return nil, trace.Wrap(err)
|
|
}
|
|
if err := data.CheckAndSetDefaults(); err != nil {
|
|
return nil, trace.Wrap(err)
|
|
}
|
|
if cfg.ID != 0 {
|
|
data.SetResourceID(cfg.ID)
|
|
}
|
|
if cfg.Revision != "" {
|
|
data.SetRevision(cfg.Revision)
|
|
}
|
|
if !cfg.Expires.IsZero() {
|
|
data.SetExpiry(cfg.Expires)
|
|
}
|
|
return &data, nil
|
|
}
|