crossplane
/
function-sdk-go
mirror of https://github.com/crossplane/function-sdk-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Nic Cope 2023-09-15 18:59:34 -07:00
parent 245eb193dc
commit ef3a2e04d3
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
request/request.go
View File

@ -44,8 +44,8 @@ func GetObservedCompositeResource(req *v1beta1.RunFunctionRequest) (*resource.Co
}
// GetObservedComposedResources from the supplied request.
func GetObservedComposedResources(req *v1beta1.RunFunctionRequest) (resource.ObservedComposedResources, error) {
ocds := resource.ObservedComposedResources{}
func GetObservedComposedResources(req *v1beta1.RunFunctionRequest) (map[resource.Name]resource.ObservedComposed, error) {
ocds := map[resource.Name]resource.ObservedComposed{}
for name, r := range req.GetObserved().GetResources() {
ocd := resource.ObservedComposed{Resource: composed.New(), ConnectionDetails: r.GetConnectionDetails()}
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.
func GetDesiredComposedResources(req *v1beta1.RunFunctionRequest) (resource.DesiredComposedResources, error) {
ocds := resource.DesiredComposedResources{}
func GetDesiredComposedResources(req *v1beta1.RunFunctionRequest) (map[resource.Name]resource.DesiredComposed, error) {
dcds := map[resource.Name]resource.DesiredComposed{}
for name, r := range req.GetDesired().GetResources() {
ocd := resource.DesiredComposed{Resource: composed.New()}
if err := resource.AsObject(r.GetResource(), ocd.Resource); err != nil {
dcd := resource.DesiredComposed{Resource: composed.New()}
if err := resource.AsObject(r.GetResource(), dcd.Resource); err != nil {
return nil, err
}
ocds[resource.Name(name)] = ocd
dcds[resource.Name(name)] = dcd
}
return ocds, nil
return dcds, nil
}

6
resource/resource.go
View File

@ -68,18 +68,12 @@ func NewDesiredComposedResource() DesiredComposed {
return DesiredComposed{Resource: composed.New()}
}
// DesiredComposedResources indexed by resource name.
type DesiredComposedResources map[Name]DesiredComposed
// ObservedComposed reflects the observed state of a composed resource.
type ObservedComposed struct {
Resource *composed.Unstructured
ConnectionDetails ConnectionDetails
}
// ObservedComposedResources indexed by resource name.
type ObservedComposedResources map[Name]ObservedComposed
// AsObject gets the supplied Kubernetes object from the supplied struct.
func AsObject(s *structpb.Struct, o runtime.Object) error {
// We try to avoid a JSON round-trip if o is backed by unstructured data.

2
response/response.go
View File

@ -61,7 +61,7 @@ func SetDesiredCompositeResource(rsp *v1beta1.RunFunctionResponse, xr *resource.
// supplied response. The caller must be sure to avoid overwriting the desired
// state that may have been accumulated by previous Functions in the pipeline,
// 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 {
rsp.Desired = &v1beta1.State{}
}