fix test

Signed-off-by: Hongchao Deng <[email protected]>
crossplane · Sep 28, 2020 · b3b7bfd · b3b7bfd
1 parent 450760e
commit b3b7bfd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/pkg/controller/v1alpha2/applicationconfiguration/applicationconfiguration_test.go b/pkg/controller/v1alpha2/applicationconfiguration/applicationconfiguration_test.go
@@ -1333,8 +1333,9 @@ func TestDependency(t *testing.T) {
 
 			ac := &v1alpha2.ApplicationConfiguration{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-app",
-					Namespace: "test-ns",
+					Name:       "test-app",
+					Namespace:  "test-ns",
+					Generation: 0,
 				},
 				Spec: v1alpha2.ApplicationConfigurationSpec{
 					Components: tc.args.components,

diff --git a/pkg/controller/v1alpha2/applicationconfiguration/render.go b/pkg/controller/v1alpha2/applicationconfiguration/render.go
@@ -502,7 +502,7 @@ func (r *components) getDataInput(ctx context.Context, s *dagSource, ac *unstruc
 
 	pavedAC := fieldpath.Pave(ac.UnstructuredContent())
 	var acGeneration int
-	if err := pavedAC.GetValueInto("metadata.generation", &acGeneration); err != nil {
+	if err := pavedAC.GetValueInto("metadata.generation", &acGeneration); err != nil && !fieldpath.IsNotFound(err) {
 		return nil, false, err.Error(), err
 	}
 

diff --git a/pkg/controller/v1alpha2/applicationconfiguration/render_test.go b/pkg/controller/v1alpha2/applicationconfiguration/render_test.go
@@ -200,6 +200,7 @@ func TestRenderComponents(t *testing.T) {
 								oam.LabelAppName:              acName,
 								oam.LabelAppComponentRevision: "",
 								oam.LabelOAMResourceType:      oam.ResourceTypeWorkload,
+								oam.LabelAppGeneration:        "0",
 							})
 							return w
 						}(),
@@ -214,6 +215,7 @@ func TestRenderComponents(t *testing.T) {
 									oam.LabelAppName:              acName,
 									oam.LabelAppComponentRevision: "",
 									oam.LabelOAMResourceType:      oam.ResourceTypeTrait,
+									oam.LabelAppGeneration:        "0",
 								})
 								return &Trait{Object: *t}
 							}(),
@@ -275,6 +277,7 @@ func TestRenderComponents(t *testing.T) {
 								oam.LabelAppName:              acName,
 								oam.LabelAppComponentRevision: revisionName,
 								oam.LabelOAMResourceType:      oam.ResourceTypeWorkload,
+								oam.LabelAppGeneration:        "0",
 							})
 							return w
 						}(),
@@ -289,6 +292,7 @@ func TestRenderComponents(t *testing.T) {
 									oam.LabelAppName:              acName,
 									oam.LabelAppComponentRevision: revisionName,
 									oam.LabelOAMResourceType:      oam.ResourceTypeTrait,
+									oam.LabelAppGeneration:        "0",
 								})
 								return &Trait{Object: *t}
 							}(),
@@ -341,6 +345,7 @@ func TestRenderComponents(t *testing.T) {
 								oam.LabelAppName:              acName,
 								oam.LabelAppComponentRevision: revisionName2,
 								oam.LabelOAMResourceType:      oam.ResourceTypeWorkload,
+								oam.LabelAppGeneration:        "0",
 							})
 							return w
 						}(),
@@ -355,6 +360,7 @@ func TestRenderComponents(t *testing.T) {
 									oam.LabelAppName:              acName,
 									oam.LabelAppComponentRevision: revisionName2,
 									oam.LabelOAMResourceType:      oam.ResourceTypeTrait,
+									oam.LabelAppGeneration:        "0",
 								})
 								return &Trait{Object: *t}
 							}(),