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.

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

Update konflux application-api dependency url #1743

Merged
merged 2 commits into from
Jul 4, 2024
Merged

Update konflux application-api dependency url #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
e523e6b
Update konflux application-api dependency url
simonbaird Jul 3, 2024
a04c45f
Update `go.mod` in acceptance
zregvart Jul 4, 2024
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
3 changes: 1 addition & 2 deletions acceptance/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions acceptance/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion acceptance/kubernetes/kind/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/validate/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/validate/image_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/validate/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ 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
github.com/open-policy-agent/conftest v0.53.0
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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion internal/applicationsnapshot/attestation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/applicationsnapshot/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/applicationsnapshot/input_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/applicationsnapshot/junit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/applicationsnapshot/report.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/applicationsnapshot/report_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/applicationsnapshot/vsa_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/evaluation_target/application_snapshot_image/application_snapshot_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/evaluation_target/application_snapshot_image/application_snapshot_image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/image/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/image/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/kubernetes/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/kubernetes/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/policy/fake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading