Merge pull request #2960 from robnester-rh/EC-1422

robnester-rh · web-flow · commit 680c32154cb4 · 2025-09-26T17:58:40.000-04:00
chore(deps): update enterprise contract CRD source to conforma/crds
diff --git a/acceptance/go.mod b/acceptance/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/cucumber/godog v0.15.0
 	github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f
 	github.com/doiit/picocolors v1.0.1
-	github.com/enterprise-contract/enterprise-contract-controller/api v0.1.112
+	github.com/conforma/crds/api v0.1.0
 	github.com/evanphx/json-patch/v5 v5.9.0
 	github.com/gkampitakis/go-snaps v0.5.7
 	github.com/go-git/go-billy/v5 v5.6.0
diff --git a/acceptance/go.sum b/acceptance/go.sum
@@ -236,6 +236,8 @@ github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUo
 github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
 github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be h1:J5BL2kskAlV9ckgEsNQXscjIaLiOYiZ75d4e94E6dcQ=
 github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be/go.mod h1:mk5IQ+Y0ZeO87b858TlA645sVcEcbiX6YqP98kt+7+w=
+github.com/conforma/crds/api v0.1.0 h1:Y2AAFKI5tywBxqr0tTBkhaiX8dsp8rkMN2CmrIofg9s=
+github.com/conforma/crds/api v0.1.0/go.mod h1:vaUCN54r99HME4555KRKOUPGJxBNAlX1agZ4jlGI2YA=
 github.com/conforma/go-containerregistry v0.20.7-0.20250703195040-6f40a3734728 h1:a2L+lVx9BYtwWDOHlouRNCzgG89Imc7Chbp2/Xjhpf0=
 github.com/conforma/go-containerregistry v0.20.7-0.20250703195040-6f40a3734728/go.mod h1:sdc2GWaYnuP7aY7cx4nTEW16xVJsVuqjZ+zyx5S0XeI=
 github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
diff --git a/acceptance/kubernetes/kind/kubernetes.go b/acceptance/kubernetes/kind/kubernetes.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	app "github.com/konflux-ci/application-api/api/v1alpha1"
 	"github.com/tektoncd/cli/pkg/formatted"
 	pipeline "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/Maldris/go-billy-afero v0.0.0-20200815120323-e9d3de59c99a
 	github.com/conforma/go-gather v1.0.2
 	github.com/docker/docker v28.2.2+incompatible
-	github.com/enterprise-contract/enterprise-contract-controller/api v0.1.112
+	github.com/conforma/crds/api v0.1.0
 	github.com/evanphx/json-patch v5.9.0+incompatible
 	github.com/gkampitakis/go-snaps v0.5.7
 	github.com/go-git/go-git/v5 v5.13.2
diff --git a/go.sum b/go.sum
@@ -344,6 +344,8 @@ github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUo
 github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
 github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be h1:J5BL2kskAlV9ckgEsNQXscjIaLiOYiZ75d4e94E6dcQ=
 github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be/go.mod h1:mk5IQ+Y0ZeO87b858TlA645sVcEcbiX6YqP98kt+7+w=
+github.com/conforma/crds/api v0.1.0 h1:Y2AAFKI5tywBxqr0tTBkhaiX8dsp8rkMN2CmrIofg9s=
+github.com/conforma/crds/api v0.1.0/go.mod h1:vaUCN54r99HME4555KRKOUPGJxBNAlX1agZ4jlGI2YA=
 github.com/conforma/go-containerregistry v0.20.7-0.20250703195040-6f40a3734728 h1:a2L+lVx9BYtwWDOHlouRNCzgG89Imc7Chbp2/Xjhpf0=
 github.com/conforma/go-containerregistry v0.20.7-0.20250703195040-6f40a3734728/go.mod h1:sdc2GWaYnuP7aY7cx4nTEW16xVJsVuqjZ+zyx5S0XeI=
 github.com/conforma/go-gather v1.0.2 h1:385cOcDpMxA7JpccMdbQOLIPsagQtDRAnSqZc1YTetI=
diff --git a/hack/ecc/ecc.sh b/hack/ecc/ecc.sh
@@ -28,14 +28,14 @@ ROOT=$(git rev-parse --show-toplevel)
 # This can be overriden by specifying the ECC_VERSION environment variable
 # beforehand
 if [ -z "${ECC_VERSION:-}" ]; then
-  SHORT_REV="api/$(cd "${ROOT}" && go list -f '{{.Version}}' -m github.com/enterprise-contract/enterprise-contract-controller/api)"
+  SHORT_REV="api/$(cd "${ROOT}" && go list -f '{{.Version}}' -m github.com/conforma/crds/api)"
   ECC_VERSION=$(
     TMP_ECC_GIT=$(mktemp -d)
     trap 'rm -rf "${TMP_ECC_GIT}"' EXIT
     cd "${TMP_ECC_GIT}"
-    git clone -q --bare https://github.com/enterprise-contract/enterprise-contract-controller.git "${TMP_ECC_GIT}"
+    git clone -q --bare https://github.com/conforma/crds.git "${TMP_ECC_GIT}"
     git show -s --pretty=format:%H "${SHORT_REV}"
   )
 fi
 
-go run -modfile "${ROOT}/tools/go.mod" sigs.k8s.io/kustomize/kustomize/v5 build "https://github.com/enterprise-contract/enterprise-contract-controller/config/crd?ref=${ECC_VERSION}"
+go run -modfile "${ROOT}/tools/go.mod" sigs.k8s.io/kustomize/kustomize/v5 build "https://github.com/conforma/crds/config/crd?ref=${ECC_VERSION}"
diff --git a/internal/applicationsnapshot/report.go b/internal/applicationsnapshot/report.go
@@ -26,7 +26,7 @@ import (
 	"fmt"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	app "github.com/konflux-ci/application-api/api/v1alpha1"
 	"sigs.k8s.io/yaml"
 
diff --git a/internal/applicationsnapshot/vsa.go b/internal/applicationsnapshot/vsa.go
@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
 )
diff --git a/internal/applicationsnapshot/vsa_test.go b/internal/applicationsnapshot/vsa_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	app "github.com/konflux-ci/application-api/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/internal/evaluation_target/definition/definition.go b/internal/evaluation_target/definition/definition.go
@@ -19,7 +19,7 @@ package definition
 import (
 	"context"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 
 	"github.com/conforma/cli/internal/evaluator"
 	"github.com/conforma/cli/internal/policy"
diff --git a/internal/evaluator/conftest_evaluator.go b/internal/evaluator/conftest_evaluator.go
@@ -28,7 +28,7 @@ import (
 	"strings"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"github.com/open-policy-agent/conftest/output"
 	conftest "github.com/open-policy-agent/conftest/policy"
 	"github.com/open-policy-agent/conftest/runner"
diff --git a/internal/evaluator/conftest_evaluator_benchmark_test.go b/internal/evaluator/conftest_evaluator_benchmark_test.go
@@ -30,7 +30,7 @@ import (
 	"testing"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"github.com/stretchr/testify/require"
 
 	"github.com/conforma/cli/internal/policy"
diff --git a/internal/evaluator/conftest_evaluator_integration_basic_test.go b/internal/evaluator/conftest_evaluator_integration_basic_test.go
@@ -34,7 +34,7 @@ import (
 	"testing"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
diff --git a/internal/evaluator/conftest_evaluator_test_helpers.go b/internal/evaluator/conftest_evaluator_test_helpers.go
@@ -41,7 +41,7 @@ import (
 	"time"
 
 	"github.com/MakeNowJust/heredoc"
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
diff --git a/internal/evaluator/conftest_evaluator_unit_core_test.go b/internal/evaluator/conftest_evaluator_unit_core_test.go
@@ -39,7 +39,7 @@ import (
 	"testing"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"github.com/gkampitakis/go-snaps/snaps"
 	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/spf13/afero"
diff --git a/internal/evaluator/conftest_evaluator_unit_filtering_test.go b/internal/evaluator/conftest_evaluator_unit_filtering_test.go
@@ -29,7 +29,7 @@ package evaluator
 import (
 	"testing"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/conforma/cli/internal/policy"
diff --git a/internal/evaluator/conftest_evaluator_unit_metadata_test.go b/internal/evaluator/conftest_evaluator_unit_metadata_test.go
@@ -35,7 +35,7 @@ import (
 	"time"
 
 	"github.com/MakeNowJust/heredoc"
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"github.com/open-policy-agent/opa/v1/ast"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/internal/evaluator/criteria.go b/internal/evaluator/criteria.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"github.com/google/go-containerregistry/pkg/name"
 	log "github.com/sirupsen/logrus"
 )
diff --git a/internal/evaluator/criteria_test.go b/internal/evaluator/criteria_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
diff --git a/internal/evaluator/filters.go b/internal/evaluator/filters.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	log "github.com/sirupsen/logrus"
 
 	"github.com/conforma/cli/internal/opa/rule"
diff --git a/internal/evaluator/filters_test.go b/internal/evaluator/filters_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
diff --git a/internal/input/report.go b/internal/input/report.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"sigs.k8s.io/yaml"
 
 	"github.com/conforma/cli/internal/evaluator"
diff --git a/internal/kubernetes/client.go b/internal/kubernetes/client.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"errors"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	app "github.com/konflux-ci/application-api/api/v1alpha1"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/internal/kubernetes/client_test.go b/internal/kubernetes/client_test.go
@@ -24,7 +24,7 @@ import (
 	"path"
 	"testing"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	app "github.com/konflux-ci/application-api/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/policy/fake.go b/internal/policy/fake.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"errors"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	app "github.com/konflux-ci/application-api/api/v1alpha1"
 )
 
diff --git a/internal/policy/fake_test.go b/internal/policy/fake_test.go
@@ -22,7 +22,7 @@ import (
 	"context"
 	"testing"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	app "github.com/konflux-ci/application-api/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/internal/policy/policy.go b/internal/policy/policy.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	"github.com/santhosh-tekuri/jsonschema/v5"
 	"github.com/sigstore/cosign/v2/cmd/cosign/cli/fulcio"
 	"github.com/sigstore/cosign/v2/cmd/cosign/cli/rekor"
diff --git a/internal/policy/policy_test.go b/internal/policy/policy_test.go
@@ -28,9 +28,9 @@ import (
 	"time"
 
 	hd "github.com/MakeNowJust/heredoc"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	fileMetadata "github.com/conforma/go-gather/gather/file"
 	"github.com/conforma/go-gather/metadata"
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
 	"github.com/sigstore/cosign/v2/pkg/cosign"
 	cosignSig "github.com/sigstore/cosign/v2/pkg/signature"
 	sigstoreSig "github.com/sigstore/sigstore/pkg/signature"
diff --git a/internal/policy/source/source.go b/internal/policy/source/source.go
@@ -31,11 +31,11 @@ import (
 	"runtime/trace"
 	"sync"
 
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	fileMetadata "github.com/conforma/go-gather/gather/file"
 	gitMetadata "github.com/conforma/go-gather/gather/git"
 	ociMetadata "github.com/conforma/go-gather/gather/oci"
 	"github.com/conforma/go-gather/metadata"
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
 
diff --git a/internal/policy/source/source_test.go b/internal/policy/source/source_test.go
@@ -28,11 +28,11 @@ import (
 	"sync"
 	"testing"
 
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	fileMetadata "github.com/conforma/go-gather/gather/file"
 	gitMetadata "github.com/conforma/go-gather/gather/git"
 	ociMetadata "github.com/conforma/go-gather/gather/oci"
 	"github.com/conforma/go-gather/metadata"
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
diff --git a/internal/validate/vsa/orchestrator_test.go b/internal/validate/vsa/orchestrator_test.go
@@ -23,7 +23,7 @@ import (
 	"errors"
 	"testing"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	app "github.com/konflux-ci/application-api/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 
diff --git a/internal/validate/vsa/service_test.go b/internal/validate/vsa/service_test.go
@@ -27,7 +27,7 @@ import (
 	"math/big"
 	"testing"
 
-	ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecc "github.com/conforma/crds/api/v1alpha1"
 	app "github.com/konflux-ci/application-api/api/v1alpha1"
 	"github.com/sigstore/cosign/v2/pkg/types"
 	"github.com/sigstore/sigstore/pkg/signature"
diff --git a/internal/validate/vsa/vsa.go b/internal/validate/vsa/vsa.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	ecapi "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecapi "github.com/conforma/crds/api/v1alpha1"
 	ssldsse "github.com/secure-systems-lab/go-securesystemslib/dsse"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
diff --git a/internal/validate/vsa/vsa_test.go b/internal/validate/vsa/vsa_test.go
@@ -26,7 +26,7 @@ import (
 	"testing"
 	"time"
 
-	ecapi "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"
+	ecapi "github.com/conforma/crds/api/v1alpha1"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	v1types "github.com/google/go-containerregistry/pkg/v1/types"
 	appapi "github.com/konflux-ci/application-api/api/v1alpha1"
diff --git a/internal/version/version.go b/internal/version/version.go
@@ -82,7 +82,7 @@ func ComputeInfo() (*VersionInfo, error) {
 		}
 	}
 
-	info.Components = append(info.Components, dependencyVersion("ECC", "github.com/enterprise-contract/enterprise-contract-controller/api", buildInfo.Deps))
+	info.Components = append(info.Components, dependencyVersion("ECC", "github.com/conforma/crds/api", buildInfo.Deps))
 	info.Components = append(info.Components, dependencyVersion("OPA", "github.com/open-policy-agent/opa", buildInfo.Deps))
 	info.Components = append(info.Components, dependencyVersion("Conftest", "github.com/open-policy-agent/conftest", buildInfo.Deps))
 	info.Components = append(info.Components, dependencyVersion("Cosign", "github.com/sigstore/cosign/v2", buildInfo.Deps))
diff --git a/internal/version/version_test.go b/internal/version/version_test.go
@@ -60,7 +60,7 @@ func TestComputeInfo(t *testing.T) {
 				},
 			},
 			Deps: []*dbg.Module{
-				{Path: "github.com/enterprise-contract/enterprise-contract-controller/api", Version: "v1"},
+				{Path: "github.com/conforma/crds/api", Version: "v1"},
 				{Path: "github.com/open-policy-agent/opa", Version: "v2"},
 				{Path: "github.com/open-policy-agent/conftest", Version: "v3"},
 				{Path: "github.com/sigstore/cosign/v2", Version: "v4"},

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"path/filepath"`
`25`	`25`	`"time"`
`26`	`26`
`27`		`- ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1"`
	`27`	`+ ecc "github.com/conforma/crds/api/v1alpha1"`
`28`	`28`	`log "github.com/sirupsen/logrus"`
`29`	`29`	`"github.com/spf13/afero"`
`30`	`30`	`)`