diff --git a/v2/internal/pkg/archive/unarchive.go b/v2/internal/pkg/archive/unarchive.go index f4f74e52d..edf142fba 100644 --- a/v2/internal/pkg/archive/unarchive.go +++ b/v2/internal/pkg/archive/unarchive.go @@ -178,7 +178,7 @@ func createFileWithProgress(parentDir string, header *tar.Header, reader *tar.Re } proxyReader := bar.ProxyReader(reader) defer proxyReader.Close() - return writeFile(descriptor, proxyReader, header.FileInfo().Mode()|0755) + return writeFile(descriptor, proxyReader, header.FileInfo().Mode()) } func writeFile(filePath string, reader io.Reader, perm os.FileMode) error { diff --git a/v2/internal/pkg/delete/delete_images.go b/v2/internal/pkg/delete/delete_images.go index f3dd93ce8..7f5af4e44 100644 --- a/v2/internal/pkg/delete/delete_images.go +++ b/v2/internal/pkg/delete/delete_images.go @@ -75,7 +75,7 @@ func (o DeleteImages) WriteDeleteMetaData(ctx context.Context, images []v2alpha1 if err != nil { o.Log.Error(deleteImagesErrMsg, err) } - err = os.WriteFile(filename, ymlData, 0755) + err = os.WriteFile(filename, ymlData, 0644) //nolint:gosec if err != nil { o.Log.Error(deleteImagesErrMsg, err) } @@ -98,7 +98,7 @@ func (o DeleteImages) WriteDeleteMetaData(ctx context.Context, images []v2alpha1 if err != nil { o.Log.Error("%v ", err) } - err = os.WriteFile(discYamlFile, discYamlData, 0755) + err = os.WriteFile(discYamlFile, discYamlData, 0644) //nolint:gosec if err != nil { o.Log.Error(deleteImagesErrMsg, err) } diff --git a/v2/internal/pkg/imagebuilder/catalog_builder.go b/v2/internal/pkg/imagebuilder/catalog_builder.go index 5459e7cb7..d699decd4 100644 --- a/v2/internal/pkg/imagebuilder/catalog_builder.go +++ b/v2/internal/pkg/imagebuilder/catalog_builder.go @@ -15,11 +15,12 @@ import ( v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/layout" "github.com/google/go-containerregistry/pkg/v1/tarball" + "github.com/otiai10/copy" + "github.com/openshift/oc-mirror/v2/internal/pkg/api/v2alpha1" "github.com/openshift/oc-mirror/v2/internal/pkg/image" "github.com/openshift/oc-mirror/v2/internal/pkg/log" "github.com/openshift/oc-mirror/v2/internal/pkg/mirror" - "github.com/otiai10/copy" ) const ( @@ -125,7 +126,7 @@ func (c GCRCatalogBuilder) RebuildCatalog(ctx context.Context, catalogCopyRef v2 if err != nil { return fmt.Errorf("error building catalog %s : %v", catalogCopyRef.Origin, err) } - err = os.WriteFile(filepath.Join(filteredDir, "digest"), []byte(digest), 0755) + err = os.WriteFile(filepath.Join(filteredDir, "digest"), []byte(digest), 0644) //nolint:gosec if err != nil { return err }