Merge pull request #47 from turkenh/backport-41-to-release-0.2

[release-0.2] Do not remove resources from observed state with regex

Author: turkenh

fn.go

@@ -113,6 +113,10 @@ func (f *Function) RunFunction(_ context.Context, req *fnv1beta1.RunFunctionRequ
 					currentRegex, _ := getStrictRegex(string(r))
 					for k := range desiredComposed {
 						if currentRegex.MatchString(string(k)) {
+							if _, ok := observedComposed[k]; ok {
+								// if the resource is already part of the observedComposed, we should not delete it
+								continue
+							}
 							delete(desiredComposed, k)
 						}
 					}

fn_test.go

@@ -621,6 +621,85 @@ func TestRunFunction(t *testing.T) {
 				},
 			},
 		},
+		"SequenceRegexObservedAreSkipped": {
+			reason: "The function should not attempt to remove resources from the desired state when they are already in the observed state",
+			args: args{
+				req: &fnv1beta1.RunFunctionRequest{
+					Input: resource.MustStructObject(&v1beta1.Input{
+						Rules: []v1beta1.SequencingRule{
+							{
+								Sequence: []resource.Name{
+									"first-.*",
+									"second-.*",
+								},
+							},
+						},
+					}),
+					Observed: &fnv1beta1.State{
+						Composite: &fnv1beta1.Resource{
+							Resource: resource.MustStructJSON(xr),
+						},
+						Resources: map[string]*fnv1beta1.Resource{
+							"first-1": {
+								Resource: resource.MustStructJSON(mr),
+								Ready:    fnv1beta1.Ready_READY_TRUE,
+							},
+							"second-1": {
+								Resource: resource.MustStructJSON(mr),
+								Ready:    fnv1beta1.Ready_READY_TRUE,
+							},
+						},
+					},
+					Desired: &fnv1beta1.State{
+						Composite: &fnv1beta1.Resource{
+							Resource: resource.MustStructJSON(xr),
+						},
+						Resources: map[string]*fnv1beta1.Resource{
+							"first-1": {
+								Resource: resource.MustStructJSON(mr),
+								Ready:    fnv1beta1.Ready_READY_TRUE,
+							},
+							"first-2": {
+								Resource: resource.MustStructJSON(mr),
+							},
+							"second-1": {
+								Resource: resource.MustStructJSON(mr),
+								Ready:    fnv1beta1.Ready_READY_TRUE,
+							},
+						},
+					},
+				},
+			},
+			want: want{
+				rsp: &fnv1beta1.RunFunctionResponse{
+					Meta: &fnv1beta1.ResponseMeta{Ttl: durationpb.New(response.DefaultTTL)},
+					Results: []*fnv1beta1.Result{
+						{
+							Severity: fnv1beta1.Severity_SEVERITY_NORMAL,
+							Message:  "Delaying creation of resource(s) matching \"second-.*\" because \"first-.*\" is not fully ready (1 of 2)",
+						},
+					},
+					Desired: &fnv1beta1.State{
+						Composite: &fnv1beta1.Resource{
+							Resource: resource.MustStructJSON(xr),
+						},
+						Resources: map[string]*fnv1beta1.Resource{
+							"first-1": {
+								Resource: resource.MustStructJSON(mr),
+								Ready:    fnv1beta1.Ready_READY_TRUE,
+							},
+							"first-2": {
+								Resource: resource.MustStructJSON(mr),
+							},
+							"second-1": {
+								Resource: resource.MustStructJSON(mr),
+								Ready:    fnv1beta1.Ready_READY_TRUE,
+							},
+						},
+					},
+				},
+			},
+		},
 		"SequenceRegexFirstGroupReady": {
 			reason: "The function should delay the creation of second and fourth resources because the first and third are not ready",
 			args: args{