If accessgrant is received with out redemptionsallowed specified (skupperproject#2198)

we will default the value to 1.   This will allow the accessgrant
to be functional.

Author: lynnemorrison

internal/kube/grants/grant_test.go

@@ -54,6 +54,13 @@ func TestGrantRegistryGeneral(t *testing.T) {
 				RedemptionsAllowed: 3,
 			},
 		},
+		&v2alpha1.AccessGrant{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "default redemptions",
+				Namespace: "test",
+				UID:       "74ebd47e-28d9-449b-ac64-df1723cb2133",
+			},
+		},
 	}
 	var skupperObjects []runtime.Object
 	for _, grant := range grants {
@@ -70,6 +77,13 @@ func TestGrantRegistryGeneral(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
+		// if redemptions == 0 first run of checkGrant defaults the value to 1, need to rerun checkGrant to perform other checks
+		if grant.ObjectMeta.Name == "default redemptions" {
+			err = registry.checkGrant(key, grant)
+			if err != nil {
+				t.Error(err)
+			}
+		}
 		latest, err := client.GetSkupperClient().SkupperV2alpha1().AccessGrants(grant.Namespace).Get(context.TODO(), grant.Name, metav1.GetOptions{})
 		if err != nil {
 			t.Error(err)
@@ -85,6 +99,11 @@ func TestGrantRegistryGeneral(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
+		if grant.Spec.RedemptionsAllowed == 0 {
+			assert.Equal(t, latest.Spec.RedemptionsAllowed, 1)
+		} else {
+			assert.Equal(t, latest.Spec.RedemptionsAllowed, grant.Spec.RedemptionsAllowed)
+		}
 		assert.Assert(t, meta.IsStatusConditionTrue(latest.Status.Conditions, v2alpha1.CONDITION_TYPE_PROCESSED))
 	}
 	for _, ca := range []string{"dummydataformyCA", "dummydataformyCA", "changedCAdata"} {

internal/kube/grants/grants.go

@@ -175,6 +175,18 @@ func (g *Grants) checkGrant(key string, grant *skupperv2alpha1.AccessGrant) erro
 		g.remove(key)
 		return nil
 	}
+
+	// if RedemptionsAllowed is not set default to 1 so that grant is usable
+	if grant.Spec.RedemptionsAllowed == 0 {
+		grant.Spec.RedemptionsAllowed = 1
+		_, e := g.clients.GetSkupperClient().SkupperV2alpha1().AccessGrants(grant.ObjectMeta.Namespace).Update(context.TODO(), grant, metav1.UpdateOptions{})
+		if e != nil {
+			return fmt.Errorf("%s", fmt.Sprintf("Failed updating Redemptions Allowed %s", e))
+		} else {
+			return nil
+		}
+	}
+
 	g.record(key, grant)
 	changed := false
 	var status []string
@@ -210,8 +222,15 @@ func (g *Grants) checkGrant(key string, grant *skupperv2alpha1.AccessGrant) erro
 			changed = true
 		}
 	}
+
 	var err error
 
+	// if RedemptionsAllowed is not set default to 1 so that grant is usable
+	if grant.Spec.RedemptionsAllowed == 0 {
+		grant.Spec.RedemptionsAllowed = 1
+		changed = true
+	}
+
 	if len(status) != 0 {
 		err = fmt.Errorf("%s", strings.Join(status, ", "))
 	}