Skip to content

🌱 Moving version and util to internal/shared #1743

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 11, 2025
Merged

🌱 Moving version and util to internal/shared #1743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
097bf9b
Moving version and util to internal/shared
LalatenduMohanty Feb 11, 2025
6b006ac
Adjusting Makefiles to the new version location
LalatenduMohanty Feb 11, 2025
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ endif
export CGO_ENABLED

export GIT_REPO := $(shell go list -m)
export VERSION_PATH := ${GIT_REPO}/internal/version
export VERSION_PATH := ${GIT_REPO}/internal/shared/version
export GO_BUILD_TAGS := containers_image_openpgp
export GO_BUILD_ASMFLAGS := all=-trimpath=$(PWD)
export GO_BUILD_GCFLAGS := all=-trimpath=$(PWD)
Expand Down
2 changes: 1 addition & 1 deletion catalogd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ VERSION := $(shell git describe --tags --always --dirty)
endif
export VERSION

export VERSION_PKG := $(shell go list -m)/internal/version
export VERSION_PKG := $(shell go list -m)/internal/shared/version

export GIT_COMMIT := $(shell git rev-parse HEAD)
export GIT_VERSION := $(shell git describe --tags --always --dirty)
Expand Down
4 changes: 2 additions & 2 deletions catalogd/cmd/catalogd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ import (
"github.com/operator-framework/operator-controller/catalogd/internal/source"
"github.com/operator-framework/operator-controller/catalogd/internal/storage"
"github.com/operator-framework/operator-controller/catalogd/internal/webhook"
fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
"github.com/operator-framework/operator-controller/internal/version"
fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
"github.com/operator-framework/operator-controller/internal/shared/version"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions catalogd/internal/source/containers_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (

catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
imageutil "github.com/operator-framework/operator-controller/internal/util/image"
fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
imageutil "github.com/operator-framework/operator-controller/internal/shared/util/image"
)

const ConfigDirLabel = "operators.operatorframework.io.index.configs.v1"
Expand Down
4 changes: 2 additions & 2 deletions cmd/operator-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ import (
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/preflights/crdupgradesafety"
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source"
"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
"github.com/operator-framework/operator-controller/internal/version"
fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
"github.com/operator-framework/operator-controller/internal/shared/version"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/catalogmetadata/filter/bundle_predicates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/operator-framework/operator-registry/alpha/declcfg"

"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
"github.com/operator-framework/operator-controller/internal/util/filter"
"github.com/operator-framework/operator-controller/internal/shared/util/filter"
)

func InMastermindsSemverRange(semverRange *mmsemver.Constraints) filter.Predicate[declcfg.Bundle] {
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/catalogmetadata/filter/successors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/operator-framework/operator-registry/alpha/declcfg"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
"github.com/operator-framework/operator-controller/internal/util/filter"
"github.com/operator-framework/operator-controller/internal/shared/util/filter"
)

func SuccessorsOf(installedBundle ocv1.BundleMetadata, channels ...declcfg.Channel) (filter.Predicate[declcfg.Bundle], error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/catalogmetadata/filter/successors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
ocv1 "github.com/operator-framework/operator-controller/api/v1"
"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare"
"github.com/operator-framework/operator-controller/internal/util/filter"
"github.com/operator-framework/operator-controller/internal/shared/util/filter"
)

func TestSuccessorsPredicate(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/resolve/catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare"
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/filter"
filterutil "github.com/operator-framework/operator-controller/internal/util/filter"
filterutil "github.com/operator-framework/operator-controller/internal/shared/util/filter"
)

type ValidationFunc func(*declcfg.Bundle) error
Expand Down
4 changes: 2 additions & 2 deletions internal/operator-controller/rukpak/source/containers_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
imageutil "github.com/operator-framework/operator-controller/internal/util/image"
fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
imageutil "github.com/operator-framework/operator-controller/internal/shared/util/image"
)

var insecurePolicy = []byte(`{"default":[{"type":"insecureAcceptAnything"}]}`)
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/rukpak/source/containers_image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source"
fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
)

const (
Expand Down
0 internal/util/filter/filter.go → internal/shared/util/filter/filter.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/util/filter/filter_test.go → internal/shared/util/filter/filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/operator-framework/operator-controller/internal/util/filter"
"github.com/operator-framework/operator-controller/internal/shared/util/filter"
)

func TestAnd(t *testing.T) {
Expand Down
0 internal/util/fs/fs.go → internal/shared/util/fs/fs.go
View file
Open in desktop
File renamed without changes.
0 internal/util/fs/fs_test.go → internal/shared/util/fs/fs_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/util/image/layers.go → internal/shared/util/image/layers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/containers/image/v5/types"
"sigs.k8s.io/controller-runtime/pkg/log"

fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
)

// ForceOwnershipRWX is a passthrough archive.Filter that sets a tar header's
Expand Down
0 internal/util/image/layers_test.go → internal/shared/util/image/layers_test.go
View file
Open in desktop
File renamed without changes.
0 internal/version/version.go → internal/shared/version/version.go
View file
Open in desktop
File renamed without changes.
Loading