Remove DesiredComposedResources and ObserveComposedResources types
These just served to obfuscate what the types actually were - a map of resource name to observed/desired composed resource structs. Signed-off-by: Nic Cope <nicc@rk0n.org>
This commit is contained in:
parent
245eb193dc
commit
ef3a2e04d3
|
@ -44,8 +44,8 @@ func GetObservedCompositeResource(req *v1beta1.RunFunctionRequest) (*resource.Co
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetObservedComposedResources from the supplied request.
|
// GetObservedComposedResources from the supplied request.
|
||||||
func GetObservedComposedResources(req *v1beta1.RunFunctionRequest) (resource.ObservedComposedResources, error) {
|
func GetObservedComposedResources(req *v1beta1.RunFunctionRequest) (map[resource.Name]resource.ObservedComposed, error) {
|
||||||
ocds := resource.ObservedComposedResources{}
|
ocds := map[resource.Name]resource.ObservedComposed{}
|
||||||
for name, r := range req.GetObserved().GetResources() {
|
for name, r := range req.GetObserved().GetResources() {
|
||||||
ocd := resource.ObservedComposed{Resource: composed.New(), ConnectionDetails: r.GetConnectionDetails()}
|
ocd := resource.ObservedComposed{Resource: composed.New(), ConnectionDetails: r.GetConnectionDetails()}
|
||||||
if err := resource.AsObject(r.GetResource(), ocd.Resource); err != nil {
|
if err := resource.AsObject(r.GetResource(), ocd.Resource); err != nil {
|
||||||
|
@ -67,14 +67,14 @@ func GetDesiredCompositeResource(req *v1beta1.RunFunctionRequest) (*resource.Com
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetDesiredComposedResources from the supplied request.
|
// GetDesiredComposedResources from the supplied request.
|
||||||
func GetDesiredComposedResources(req *v1beta1.RunFunctionRequest) (resource.DesiredComposedResources, error) {
|
func GetDesiredComposedResources(req *v1beta1.RunFunctionRequest) (map[resource.Name]resource.DesiredComposed, error) {
|
||||||
ocds := resource.DesiredComposedResources{}
|
dcds := map[resource.Name]resource.DesiredComposed{}
|
||||||
for name, r := range req.GetDesired().GetResources() {
|
for name, r := range req.GetDesired().GetResources() {
|
||||||
ocd := resource.DesiredComposed{Resource: composed.New()}
|
dcd := resource.DesiredComposed{Resource: composed.New()}
|
||||||
if err := resource.AsObject(r.GetResource(), ocd.Resource); err != nil {
|
if err := resource.AsObject(r.GetResource(), dcd.Resource); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
ocds[resource.Name(name)] = ocd
|
dcds[resource.Name(name)] = dcd
|
||||||
}
|
}
|
||||||
return ocds, nil
|
return dcds, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,18 +68,12 @@ func NewDesiredComposedResource() DesiredComposed {
|
||||||
return DesiredComposed{Resource: composed.New()}
|
return DesiredComposed{Resource: composed.New()}
|
||||||
}
|
}
|
||||||
|
|
||||||
// DesiredComposedResources indexed by resource name.
|
|
||||||
type DesiredComposedResources map[Name]DesiredComposed
|
|
||||||
|
|
||||||
// ObservedComposed reflects the observed state of a composed resource.
|
// ObservedComposed reflects the observed state of a composed resource.
|
||||||
type ObservedComposed struct {
|
type ObservedComposed struct {
|
||||||
Resource *composed.Unstructured
|
Resource *composed.Unstructured
|
||||||
ConnectionDetails ConnectionDetails
|
ConnectionDetails ConnectionDetails
|
||||||
}
|
}
|
||||||
|
|
||||||
// ObservedComposedResources indexed by resource name.
|
|
||||||
type ObservedComposedResources map[Name]ObservedComposed
|
|
||||||
|
|
||||||
// AsObject gets the supplied Kubernetes object from the supplied struct.
|
// AsObject gets the supplied Kubernetes object from the supplied struct.
|
||||||
func AsObject(s *structpb.Struct, o runtime.Object) error {
|
func AsObject(s *structpb.Struct, o runtime.Object) error {
|
||||||
// We try to avoid a JSON round-trip if o is backed by unstructured data.
|
// We try to avoid a JSON round-trip if o is backed by unstructured data.
|
||||||
|
|
|
@ -61,7 +61,7 @@ func SetDesiredCompositeResource(rsp *v1beta1.RunFunctionResponse, xr *resource.
|
||||||
// supplied response. The caller must be sure to avoid overwriting the desired
|
// supplied response. The caller must be sure to avoid overwriting the desired
|
||||||
// state that may have been accumulated by previous Functions in the pipeline,
|
// state that may have been accumulated by previous Functions in the pipeline,
|
||||||
// unless they intend to.
|
// unless they intend to.
|
||||||
func SetDesiredComposedResources(rsp *v1beta1.RunFunctionResponse, dcds resource.DesiredComposedResources) error {
|
func SetDesiredComposedResources(rsp *v1beta1.RunFunctionResponse, dcds map[resource.Name]resource.DesiredComposed) error {
|
||||||
if rsp.Desired == nil {
|
if rsp.Desired == nil {
|
||||||
rsp.Desired = &v1beta1.State{}
|
rsp.Desired = &v1beta1.State{}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue