apply review comments

Signed-off-by: Xavier Coulon <xcoulon@redhat.com>
codeready-toolchain · Mar 16, 2020 · 98dca2f · 98dca2f
1 parent f9db912
commit 98dca2f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/pkg/templates/nstemplatetiers/nstemplatetier_generator.go b/pkg/templates/nstemplatetiers/nstemplatetier_generator.go
@@ -40,14 +40,14 @@ func CreateOrUpdateResources(s *runtime.Scheme, client client.Client, namespace
 		tierObj := tierObjs[tier]
 		log.Info("creating or updating NSTemplateTier", "namespace", tierObj.Namespace, "name", tierObj.Name)
 		cl := commonclient.NewApplyClient(client, s)
-		created, err := cl.CreateOrUpdateObject(tierObj, true, nil)
+		createdOrUpdated, err := cl.CreateOrUpdateObject(tierObj, true, nil)
 		if err != nil {
 			return errors.Wrapf(err, "unable to create or update the '%s' NSTemplateTiers in namespace '%s'", tierObj.Name, tierObj.Namespace)
 		}
-		if created {
-			log.Info("NSTemplateTier resource created", "namespace", tierObj.Namespace, "name", tierObj.Name)
+		if createdOrUpdated {
+			log.Info("NSTemplateTier resource created/updated", "namespace", tierObj.Namespace, "name", tierObj.Name)
 		} else {
-			log.Info("NSTemplateTier resource updated", "namespace", tierObj.Namespace, "name", tierObj.Name, "ResourceVersion", tierObj.ResourceVersion)
+			log.Info("NSTemplateTier resource was already up-to-date", "namespace", tierObj.Namespace, "name", tierObj.Name, "ResourceVersion", tierObj.ResourceVersion)
 		}
 	}
 	return nil

diff --git a/pkg/templates/nstemplatetiers/nstemplatetier_generator_whitebox_test.go b/pkg/templates/nstemplatetiers/nstemplatetier_generator_whitebox_test.go
@@ -50,12 +50,12 @@ func TestLoadTemplatesByTiers(t *testing.T) {
 							assert.NotEmpty(t, tmpls[tier].namespaceTemplates[kind].revision)
 							assert.NotEmpty(t, tmpls[tier].namespaceTemplates[kind].content)
 						})
-						t.Run("cluster", func(t *testing.T) {
-							require.NotNil(t, tmpls[tier].clusterTemplate)
-							assert.NotEmpty(t, tmpls[tier].clusterTemplate.revision)
-							assert.NotEmpty(t, tmpls[tier].clusterTemplate.content)
-						})
 					}
+					t.Run("cluster", func(t *testing.T) {
+						require.NotNil(t, tmpls[tier].clusterTemplate)
+						assert.NotEmpty(t, tmpls[tier].clusterTemplate.revision)
+						assert.NotEmpty(t, tmpls[tier].clusterTemplate.content)
+					})
 				})
 			}
 		})