From e523e6b530288b90ef0fc8182bfc2e59de53fff6 Mon Sep 17 00:00:00 2001 From: Simon Baird Date: Wed, 3 Jul 2024 13:00:24 -0400 Subject: [PATCH 1/2] Update konflux application-api dependency url Ref: https://issues.redhat.com/browse/EC-361 --- acceptance/kubernetes/kind/kubernetes.go | 2 +- cmd/validate/image.go | 2 +- cmd/validate/image_integration_test.go | 2 +- cmd/validate/image_test.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- internal/applicationsnapshot/attestation_test.go | 2 +- internal/applicationsnapshot/input.go | 2 +- internal/applicationsnapshot/input_test.go | 2 +- internal/applicationsnapshot/junit_test.go | 2 +- internal/applicationsnapshot/report.go | 2 +- internal/applicationsnapshot/report_test.go | 2 +- internal/applicationsnapshot/vsa_test.go | 2 +- .../application_snapshot_image/application_snapshot_image.go | 2 +- .../application_snapshot_image_test.go | 2 +- internal/image/validate.go | 2 +- internal/image/validate_test.go | 2 +- internal/kubernetes/client.go | 2 +- internal/kubernetes/client_test.go | 2 +- internal/policy/fake.go | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/acceptance/kubernetes/kind/kubernetes.go b/acceptance/kubernetes/kind/kubernetes.go index 7081f2d60..0f0ae996d 100644 --- a/acceptance/kubernetes/kind/kubernetes.go +++ b/acceptance/kubernetes/kind/kubernetes.go @@ -27,7 +27,7 @@ import ( "time" ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1" - app "github.com/redhat-appstudio/application-api/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" tekton "github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1" diff --git a/cmd/validate/image.go b/cmd/validate/image.go index bf80df092..5cf158c4c 100644 --- a/cmd/validate/image.go +++ b/cmd/validate/image.go @@ -26,7 +26,7 @@ import ( hd "github.com/MakeNowJust/heredoc" "github.com/hashicorp/go-multierror" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/sigstore/cosign/v2/pkg/cosign" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/validate/image_integration_test.go b/cmd/validate/image_integration_test.go index 951a0d84d..71a318847 100644 --- a/cmd/validate/image_integration_test.go +++ b/cmd/validate/image_integration_test.go @@ -28,7 +28,7 @@ import ( "time" "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/validate/image_test.go b/cmd/validate/image_test.go index 22a0523be..0432877f1 100644 --- a/cmd/validate/image_test.go +++ b/cmd/validate/image_test.go @@ -30,7 +30,7 @@ import ( hd "github.com/MakeNowJust/heredoc" "github.com/gkampitakis/go-snaps/snaps" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/sigstore/cosign/v2/pkg/cosign" log "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/test" diff --git a/go.mod b/go.mod index 0ac6b7b72..51cc8b788 100644 --- a/go.mod +++ b/go.mod @@ -21,6 +21,7 @@ require ( github.com/in-toto/in-toto-golang v0.9.0 github.com/invopop/jsonschema v0.12.0 github.com/jstemmer/go-junit-report/v2 v2.1.0 + github.com/konflux-ci/application-api v0.0.0-20240527211352-be061932d497 github.com/leanovate/gopter v0.2.11 github.com/mattn/go-isatty v0.0.20 github.com/mitchellh/go-wordwrap v1.0.1 @@ -28,7 +29,6 @@ require ( github.com/open-policy-agent/opa v0.66.0 github.com/package-url/packageurl-go v0.1.3 github.com/qri-io/jsonpointer v0.1.1 - github.com/redhat-appstudio/application-api v0.0.0-20231026192857-89515ad2504f github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 github.com/secure-systems-lab/go-securesystemslib v0.8.0 github.com/sigstore/cosign/v2 v2.2.4 diff --git a/go.sum b/go.sum index 19cc69097..c0c80498d 100644 --- a/go.sum +++ b/go.sum @@ -932,6 +932,8 @@ github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8 github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/konflux-ci/application-api v0.0.0-20240527211352-be061932d497 h1:Xv063qqQY8tPNYvx4+hTtWw4DPDAVa4A1SJibvPBsS4= +github.com/konflux-ci/application-api v0.0.0-20240527211352-be061932d497/go.mod h1:948Z+a1IbfRT0RtoHzWWSN9YEucSbMJTHaMhz7dVICc= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -1116,8 +1118,6 @@ github.com/qri-io/jsonpointer v0.1.1 h1:prVZBZLL6TW5vsSB9fFHFAMBLI4b0ri5vribQlTJ github.com/qri-io/jsonpointer v0.1.1/go.mod h1:DnJPaYgiKu56EuDp8TU5wFLdZIcAnb/uH9v37ZaMV64= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/redhat-appstudio/application-api v0.0.0-20231026192857-89515ad2504f h1:PoKf7gCV/g5blkzVlODkqeynmfIACcR7NqWF8eqnuec= -github.com/redhat-appstudio/application-api v0.0.0-20231026192857-89515ad2504f/go.mod h1:YvckuKHe82eWloGk0/BpSw4YYG2owrGZAanztbOj3pQ= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= diff --git a/internal/applicationsnapshot/attestation_test.go b/internal/applicationsnapshot/attestation_test.go index 5da4ddd29..d5703870f 100644 --- a/internal/applicationsnapshot/attestation_test.go +++ b/internal/applicationsnapshot/attestation_test.go @@ -24,7 +24,7 @@ import ( "github.com/gkampitakis/go-snaps/snaps" "github.com/in-toto/in-toto-golang/in_toto" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/stretchr/testify/assert" "github.com/enterprise-contract/ec-cli/internal/attestation" diff --git a/internal/applicationsnapshot/input.go b/internal/applicationsnapshot/input.go index 351277623..f7645ce4d 100644 --- a/internal/applicationsnapshot/input.go +++ b/internal/applicationsnapshot/input.go @@ -23,7 +23,7 @@ import ( "github.com/google/go-containerregistry/pkg/name" "github.com/hashicorp/go-multierror" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" log "github.com/sirupsen/logrus" "github.com/spf13/afero" "golang.org/x/exp/slices" diff --git a/internal/applicationsnapshot/input_test.go b/internal/applicationsnapshot/input_test.go index 3eb4fc9dd..f455bd637 100644 --- a/internal/applicationsnapshot/input_test.go +++ b/internal/applicationsnapshot/input_test.go @@ -30,7 +30,7 @@ import ( v1 "github.com/google/go-containerregistry/pkg/v1" gcrfake "github.com/google/go-containerregistry/pkg/v1/fake" "github.com/google/go-containerregistry/pkg/v1/types" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" log "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/test" "github.com/spf13/afero" diff --git a/internal/applicationsnapshot/junit_test.go b/internal/applicationsnapshot/junit_test.go index 515966a00..9b01e3c45 100644 --- a/internal/applicationsnapshot/junit_test.go +++ b/internal/applicationsnapshot/junit_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/jstemmer/go-junit-report/v2/junit" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/stretchr/testify/assert" "github.com/enterprise-contract/ec-cli/internal/evaluator" diff --git a/internal/applicationsnapshot/report.go b/internal/applicationsnapshot/report.go index b5505e48d..6331d8f4d 100644 --- a/internal/applicationsnapshot/report.go +++ b/internal/applicationsnapshot/report.go @@ -27,7 +27,7 @@ import ( ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1" "github.com/hashicorp/go-multierror" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "sigs.k8s.io/yaml" "github.com/enterprise-contract/ec-cli/internal/attestation" diff --git a/internal/applicationsnapshot/report_test.go b/internal/applicationsnapshot/report_test.go index cf860c3aa..777e67b99 100644 --- a/internal/applicationsnapshot/report_test.go +++ b/internal/applicationsnapshot/report_test.go @@ -28,7 +28,7 @@ import ( "time" "github.com/gkampitakis/go-snaps/snaps" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/applicationsnapshot/vsa_test.go b/internal/applicationsnapshot/vsa_test.go index 1089936e2..2680860cc 100644 --- a/internal/applicationsnapshot/vsa_test.go +++ b/internal/applicationsnapshot/vsa_test.go @@ -26,7 +26,7 @@ import ( ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1" "github.com/in-toto/in-toto-golang/in_toto" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/stretchr/testify/assert" "github.com/enterprise-contract/ec-cli/internal/attestation" diff --git a/internal/evaluation_target/application_snapshot_image/application_snapshot_image.go b/internal/evaluation_target/application_snapshot_image/application_snapshot_image.go index 38c20195e..b01eecccb 100644 --- a/internal/evaluation_target/application_snapshot_image/application_snapshot_image.go +++ b/internal/evaluation_target/application_snapshot_image/application_snapshot_image.go @@ -26,7 +26,7 @@ import ( "path" "github.com/google/go-containerregistry/pkg/name" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/santhosh-tekuri/jsonschema/v5" "github.com/sigstore/cosign/v2/pkg/cosign" log "github.com/sirupsen/logrus" diff --git a/internal/evaluation_target/application_snapshot_image/application_snapshot_image_test.go b/internal/evaluation_target/application_snapshot_image/application_snapshot_image_test.go index 4a69a4577..909b4fa18 100644 --- a/internal/evaluation_target/application_snapshot_image/application_snapshot_image_test.go +++ b/internal/evaluation_target/application_snapshot_image/application_snapshot_image_test.go @@ -37,7 +37,7 @@ import ( "github.com/in-toto/in-toto-golang/in_toto" "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/common" v02 "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/secure-systems-lab/go-securesystemslib/dsse" "github.com/sigstore/cosign/v2/pkg/cosign" "github.com/sigstore/cosign/v2/pkg/oci" diff --git a/internal/image/validate.go b/internal/image/validate.go index 60dd93a8d..3d77589a9 100644 --- a/internal/image/validate.go +++ b/internal/image/validate.go @@ -22,8 +22,8 @@ import ( "sort" "time" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/qri-io/jsonpointer" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" log "github.com/sirupsen/logrus" "github.com/enterprise-contract/ec-cli/internal/attestation" diff --git a/internal/image/validate_test.go b/internal/image/validate_test.go index f91c6a308..9bce55356 100644 --- a/internal/image/validate_test.go +++ b/internal/image/validate_test.go @@ -34,7 +34,7 @@ import ( "github.com/in-toto/in-toto-golang/in_toto" "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/common" v02 "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/sigstore/cosign/v2/pkg/oci" "github.com/sigstore/cosign/v2/pkg/oci/static" cosignTypes "github.com/sigstore/cosign/v2/pkg/types" diff --git a/internal/kubernetes/client.go b/internal/kubernetes/client.go index e27d3b89a..386c591ce 100644 --- a/internal/kubernetes/client.go +++ b/internal/kubernetes/client.go @@ -21,7 +21,7 @@ import ( "errors" ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/kubernetes/client_test.go b/internal/kubernetes/client_test.go index 27ce0c3af..43130b5c9 100644 --- a/internal/kubernetes/client_test.go +++ b/internal/kubernetes/client_test.go @@ -25,7 +25,7 @@ import ( "testing" ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/stretchr/testify/assert" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/policy/fake.go b/internal/policy/fake.go index cf4351eef..ce7d9dd04 100644 --- a/internal/policy/fake.go +++ b/internal/policy/fake.go @@ -21,7 +21,7 @@ import ( "errors" ecc "github.com/enterprise-contract/enterprise-contract-controller/api/v1alpha1" - app "github.com/redhat-appstudio/application-api/api/v1alpha1" + app "github.com/konflux-ci/application-api/api/v1alpha1" ) type FakeKubernetesClient struct { From a04c45f4d8822d735016724d077adc83d605d6ea Mon Sep 17 00:00:00 2001 From: Zoran Regvart Date: Thu, 4 Jul 2024 11:45:02 +0200 Subject: [PATCH 2/2] Update `go.mod` in acceptance --- acceptance/go.mod | 3 +-- acceptance/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/acceptance/go.mod b/acceptance/go.mod index 2c8691b62..f76d89fe9 100644 --- a/acceptance/go.mod +++ b/acceptance/go.mod @@ -16,6 +16,7 @@ require ( github.com/google/go-containerregistry v0.19.2 github.com/hashicorp/go-multierror v1.1.1 github.com/in-toto/in-toto-golang v0.9.0 + github.com/konflux-ci/application-api v0.0.0-20240527211352-be061932d497 github.com/otiai10/copy v1.14.0 github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e @@ -42,8 +43,6 @@ require ( sigs.k8s.io/yaml v1.4.0 ) -require github.com/redhat-appstudio/application-api v0.0.0-20231026192857-89515ad2504f - require ( contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect diff --git a/acceptance/go.sum b/acceptance/go.sum index a974bdb18..ff929aea4 100644 --- a/acceptance/go.sum +++ b/acceptance/go.sum @@ -596,6 +596,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/konflux-ci/application-api v0.0.0-20240527211352-be061932d497 h1:Xv063qqQY8tPNYvx4+hTtWw4DPDAVa4A1SJibvPBsS4= +github.com/konflux-ci/application-api v0.0.0-20240527211352-be061932d497/go.mod h1:948Z+a1IbfRT0RtoHzWWSN9YEucSbMJTHaMhz7dVICc= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -763,8 +765,6 @@ github.com/protocolbuffers/txtpbfmt v0.0.0-20231025115547-084445ff1adf h1:014O62 github.com/protocolbuffers/txtpbfmt v0.0.0-20231025115547-084445ff1adf/go.mod h1:jgxiZysxFPM+iWKwQwPR+y+Jvo54ARd4EisXxKYpB5c= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/redhat-appstudio/application-api v0.0.0-20231026192857-89515ad2504f h1:PoKf7gCV/g5blkzVlODkqeynmfIACcR7NqWF8eqnuec= -github.com/redhat-appstudio/application-api v0.0.0-20231026192857-89515ad2504f/go.mod h1:YvckuKHe82eWloGk0/BpSw4YYG2owrGZAanztbOj3pQ= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=