Defer openAPI cleanup

kyaml/setters2/settersutil/deletecreator_test.go

@@ -71,10 +71,11 @@ func TestDeleterCreator_Delete(t *testing.T) {
 		DefinitionPrefix: fieldmeta.SetterDefinitionPrefix,
 	}
 
-	err = openapi.AddSchemaFromFile(openAPI.Name())
+	clean, err := openapi.AddSchemaFromFile(openAPI.Name())
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
+	defer clean()
 	dc.OpenAPIPath = openAPI.Name()
 	dc.ResourcesPath = resource.Name()
 

kyaml/setters2/settersutil/deletercreator.go

@@ -39,9 +39,11 @@ func (d DeleterCreator) Delete() error {
 	}
 
 	// Load the updated definitions
-	if err := openapi.AddSchemaFromFile(d.OpenAPIPath); err != nil {
+	clean, err := openapi.AddSchemaFromFile(d.OpenAPIPath)
+	if err != nil {
 		return err
 	}
+	defer clean()
 
 	// Update the resources with the deleter reference
 	inout := &kio.LocalPackageReadWriter{PackagePath: d.ResourcesPath, PackageFileName: d.OpenAPIFileName}

kyaml/setters2/settersutil/fieldsetter.go

@@ -79,9 +79,11 @@ func (fs FieldSetter) Set() (int, error) {
 	}
 
 	// Load the updated definitions
-	if err := openapi.AddSchemaFromFile(fs.OpenAPIPath); err != nil {
+	clean, err := openapi.AddSchemaFromFile(fs.OpenAPIPath)
+	if err != nil {
 		return 0, err
 	}
+	defer clean()
 
 	// Update the resources with the new value
 	// Set NoDeleteFiles to true as SetAll will return only the nodes of files which should be updated and
@@ -108,9 +110,11 @@ func (fs FieldSetter) Set() (int, error) {
 // If syncOpenAPI is true, the openAPI files in destination directories are also
 // updated with the setter values in the input openAPI file
 func SetAllSetterDefinitions(syncOpenAPI bool, openAPIPath string, dirs ...string) error {
-	if err := openapi.AddSchemaFromFile(openAPIPath); err != nil {
+	clean, err := openapi.AddSchemaFromFile(openAPIPath)
+	if err != nil {
 		return err
 	}
+	defer clean()
 	for _, destDir := range dirs {
 		if syncOpenAPI {
 			openAPIFileName := filepath.Base(openAPIPath)
@@ -122,7 +126,7 @@ func SetAllSetterDefinitions(syncOpenAPI bool, openAPIPath string, dirs ...strin
 		rw := &kio.LocalPackageReadWriter{
 			PackagePath: destDir,
 			// set output won't include resources from files which
-			//weren't modified.  make sure we don't delete them.
+			// weren't modified.  make sure we don't delete them.
 			NoDeleteFiles: true,
 		}
 

kyaml/setters2/settersutil/settercreator.go

@@ -103,9 +103,11 @@ func (c SetterCreator) Create() error {
 	}
 
 	// Load the updated definitions
-	if err := openapi.AddSchemaFromFile(c.OpenAPIPath); err != nil {
+	clean, err := openapi.AddSchemaFromFile(c.OpenAPIPath)
+	if err != nil {
 		return err
 	}
+	defer clean()
 	// if the setter is of array type write the derived list values back to
 	// openAPI definitions
 	if len(a.ListValues) > 0 {

kyaml/setters2/settersutil/substitutioncreator.go

@@ -93,9 +93,11 @@ func (c SubstitutionCreator) Create() error {
 	}
 
 	// Load the updated definitions
-	if err := openapi.AddSchemaFromFile(c.OpenAPIPath); err != nil {
+	clean, err := openapi.AddSchemaFromFile(c.OpenAPIPath)
+	if err != nil {
 		return err
 	}
+	defer clean()
 
 	visited := sets.String{}
 	ref, err := spec.NewRef(fieldmeta.DefinitionsPrefix + fieldmeta.SubstitutionDefinitionPrefix + c.Name)
@@ -119,9 +121,11 @@ func (c SubstitutionCreator) Create() error {
 	}
 
 	// Load the updated definitions after setters are created
-	if err := openapi.AddSchemaFromFile(c.OpenAPIPath); err != nil {
+	clean, err = openapi.AddSchemaFromFile(c.OpenAPIPath)
+	if err != nil {
 		return err
 	}
+	defer clean()
 
 	// revert openAPI file if there are cycles detected in created input substitution
 	if err := checkForCycles(ext, visited); err != nil {

kyaml/setters2/settersutil/substitutioncreator_test.go

@@ -103,7 +103,7 @@ func TestGetValuesForMarkers(t *testing.T) {
 					}
 				}
 			} else {
-				//if expectedError is not nil, check for correctness of error message
+				// if expectedError is not nil, check for correctness of error message
 				assert.Contains(t, err.Error(), test.expectedError.Error())
 			}
 		})