Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix RFE-4185: run bundle-upgrade with long image names #6477

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog/fragments/01-hash-cache-directory-name.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# entries is a list of entries to include in
# release notes and/or the migration guide
entries:
- description: In `run bundle-upgrade`, hash the cache directory name to avoid error of too long file name.
kind: "bugfix"
breaking: false
12 changes: 11 additions & 1 deletion internal/olm/fbcutil/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package fbcutil
import (
"bytes"
"context"
"crypto/sha256"
"errors"
"fmt"
"io"
Expand Down Expand Up @@ -134,7 +135,8 @@ func NullLogger() *log.Entry {
// RenderRefs will invoke Operator Registry APIs and return a declarative config object representation
// of the references that are passed in as a string array.
func RenderRefs(ctx context.Context, refs []string, skipTLSVerify bool, useHTTP bool) (*declarativeconfig.DeclarativeConfig, error) {
cacheDir := strings.ReplaceAll(strings.Join(refs, "_"), "/", "-")
cacheDir := dirNameFromRefs(refs)

if cacheDir == "" {
cacheDir = DefaultCacheDir
}
Expand Down Expand Up @@ -169,6 +171,14 @@ func RenderRefs(ctx context.Context, refs []string, skipTLSVerify bool, useHTTP
return declcfg, nil
}

func dirNameFromRefs(refs []string) string {
dirNameBytes := []byte(strings.ReplaceAll(strings.Join(refs, "_"), "/", "-"))
hash := sha256.New()
hash.Write(dirNameBytes)
hashBytes := hash.Sum(nil)
return fmt.Sprintf("%x", hashBytes)
Comment on lines +178 to +179
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we shorten this to something like:

Suggested change
hashBytes := hash.Sum(nil)
return fmt.Sprintf("%x", hashBytes)
return string(hash.Sum(nil))

?

If not this is fine, but I think those are equivalent and doesn't require use of the fmt.Sprintf function

Copy link
Contributor Author

@nunnatsa nunnatsa Jun 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the comment @everettraven - but these two forms are not equivalent. string(hash.Sum(nil)) will try to use the random bytes as characters. The result is unexpected - we'll end up with wrong UTF-8 chars, non-printable chars and so on.

The original format generates a hex string (2 hex digits per byte), which is a safe string.

}

// IsFBC will determine if an index image uses the File-Based Catalog or SQLite index image format.
// The default index image will adopt the File-Based Catalog format.
func IsFBC(ctx context.Context, indexImage string) (bool, error) {
Expand Down
52 changes: 52 additions & 0 deletions internal/olm/fbcutil/util_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// Copyright 2023 The Operator-SDK Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package fbcutil

import (
"crypto/sha256"
"fmt"
"testing"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)

var _ = Describe("test fbutil", func() {

emptyListHash := fmt.Sprintf("%x", sha256.New().Sum(nil))

Context("test dirNameFromRefs", func() {
DescribeTable("should name the directory with sha256 of the concatenation of the bundle image names", func(refs []string, expectedHash string) {
dirName := dirNameFromRefs(refs)

Expect(dirName).Should(HaveLen(sha256.Size * 2)) // in hex representation, each byte is two hex digits
Expect(dirName).Should(Equal(expectedHash))
},
Entry("long image names", []string{
"BtU5KRr8IWafnGTvckShoj3xBb5duLZp/XKHZRpOqdVxhHQkCL0Dy0lSRw0a0M/y158JRQKk1S@6KAauQHujQ30my9sivVYGZahR7R7UUSoUBUmnuFdqGHiUTT0aV5Di2",
"lKM63iKupQcUPKd6AAsmRRABbGYNmwFTmQEX6fpswndQdb/niJPLRG8WhzaH84Q3kfZC/7hc3nK7Oeq@L5KxmVqbAz6jXlv1yKna2cH4zbZ3be0pcYNHyCSVUG/ZVqRAo",
}, "cc048355dce06491fd090ce0c3ce5a48db3528250ad13a4fbf4090a3de8c325a"),
Entry("multiple refs", []string{"a/b/c", "d/e/f", "g/h/i/j", "k/l/m/n/o"}, "df22ac3ac9e59ed300f70b9c2fdd7128be064652839a813948ee9fd1a2f36581"),
Entry("single ref", []string{"a/b/c"}, "cbd2be7b96f770a0326948ebd158cf539fab0627e8adbddc97f7a65c6a8ae59a"),
Entry("no refs", []string{}, emptyListHash),
Entry("no refs (nil)", nil, emptyListHash),
)
})
})

func TestRegistry(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "fbutil Suite")
}