package/scaffold/olm-catalog: fix CRD description updater (#1060)

* pkg/scaffold/olm-catalog/csv_updaters.go: fix pointer setting issue
* pkg/scaffold/scaffold.go: truncate files to be overwritten
* pkg/scaffold/crd_test.go: use different file name to avoid test-framework test file truncation

Author: estroz

pkg/scaffold/crd_test.go

@@ -47,7 +47,11 @@ func TestCRDGoProject(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer func() { os.Chdir(absPath) }()
-	err = s.Execute(cfg, &CRD{Resource: r, IsOperatorGo: true})
+	err = s.Execute(cfg, &CRD{
+		Input:        input.Input{Path: filepath.Join(tfDir, "cache_v1alpha1_memcached.yaml")},
+		Resource:     r,
+		IsOperatorGo: true,
+	})
 	if err != nil {
 		t.Fatalf("Failed to execute the scaffold: (%v)", err)
 	}

pkg/scaffold/olm-catalog/csv_updaters.go

@@ -223,23 +223,29 @@ func parseCRDDescriptionFromYAML(yamlDoc []byte) (*olmapiv1alpha1.CRDDescription
 // Apply updates all CRDDescriptions with any user-defined data in csv's
 // CRDDescriptions.
 func (u *CSVCustomResourceDefinitionsUpdate) Apply(csv *olmapiv1alpha1.ClusterServiceVersion) error {
-	crdDescSet := make(map[string]*olmapiv1alpha1.CRDDescription)
-	for _, desc := range u.Owned {
-		crdDescSet[desc.Name] = &desc
-	}
-	for _, desc := range u.Required {
-		crdDescSet[desc.Name] = &desc
-	}
+	set := make(map[string]*olmapiv1alpha1.CRDDescription)
 	for _, csvDesc := range csv.GetAllCRDDescriptions() {
-		if uDesc, ok := crdDescSet[csvDesc.Name]; ok {
-			uDesc.DisplayName = csvDesc.DisplayName
-			uDesc.Description = csvDesc.Description
-			uDesc.ActionDescriptor = csvDesc.ActionDescriptor
-			uDesc.SpecDescriptors = csvDesc.SpecDescriptors
-			uDesc.StatusDescriptors = csvDesc.StatusDescriptors
-			uDesc.Resources = csvDesc.Resources
+		set[csvDesc.Name] = &csvDesc
+	}
+	du := u.DeepCopy()
+	for i, uDesc := range du.Owned {
+		if csvDesc, ok := set[uDesc.Name]; ok {
+			d := csvDesc.DeepCopy()
+			d.Name = uDesc.Name
+			d.Version = uDesc.Version
+			d.Kind = uDesc.Kind
+			du.Owned[i] = *d
+		}
+	}
+	for i, uDesc := range du.Required {
+		if csvDesc, ok := set[uDesc.Name]; ok {
+			d := csvDesc.DeepCopy()
+			d.Name = uDesc.Name
+			d.Version = uDesc.Version
+			d.Kind = uDesc.Kind
+			du.Required[i] = *d
 		}
 	}
-	csv.Spec.CustomResourceDefinitions = *u.CustomResourceDefinitions
+	csv.Spec.CustomResourceDefinitions = *du
 	return nil
 }

pkg/scaffold/scaffold.go

@@ -167,6 +167,12 @@ func (s *Scaffold) doRender(i input.Input, e input.File, absPath string) error {
 		}
 	}
 
+	// Files being overwritten must be trucated to len 0 so no old bytes remain.
+	if _, err = os.Stat(absPath); err == nil && i.IfExistsAction == input.Overwrite {
+		if err = os.Truncate(absPath, 0); err != nil {
+			return err
+		}
+	}
 	_, err = f.Write(b)
 	log.Infoln("Create", i.Path)
 	return err