From 5987bdd651dbf11cc3b360d096fc67f7f555908d Mon Sep 17 00:00:00 2001 From: thepetk Date: Wed, 29 May 2024 17:43:21 +0100 Subject: [PATCH] Update application-api refs Signed-off-by: thepetk --- Makefile | 2 +- README.md | 2 +- config/samples/snapshot/snapshot.yaml | 2 +- contracts/pact_state_handlers_methods.go | 2 +- contracts/pact_utils.go | 2 +- controllers/application_controller.go | 2 +- controllers/application_controller_conditions.go | 2 +- controllers/application_controller_test.go | 2 +- controllers/component_controller.go | 2 +- controllers/component_controller_conditions.go | 2 +- controllers/component_controller_test.go | 2 +- controllers/componentdetectionquery_controller.go | 2 +- controllers/componentdetectionquery_controller_conditions.go | 2 +- .../componentdetectionquery_controller_conditions_test.go | 2 +- controllers/componentdetectionquery_controller_test.go | 2 +- controllers/mapper.go | 2 +- controllers/mapper_test.go | 2 +- controllers/start_test_env.go | 2 +- controllers/update.go | 2 +- controllers/update_test.go | 2 +- controllers/webhooks/application_webhook.go | 2 +- controllers/webhooks/application_webhook_test.go | 2 +- controllers/webhooks/application_webhook_unit_test.go | 2 +- controllers/webhooks/component_webhook.go | 2 +- controllers/webhooks/component_webhook_test.go | 2 +- controllers/webhooks/component_webhook_unit_test.go | 2 +- controllers/webhooks/webhook_suite_test.go | 2 +- docs/serviceability.md | 2 +- gitops/generate_build.go | 2 +- gitops/generate_build_test.go | 2 +- gitops/prepare/prepare.go | 2 +- gitops/prepare/prepare_test.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- main.go | 2 +- pkg/devfile/devfile.go | 2 +- pkg/devfile/devfile_test.go | 2 +- pkg/spi/spi.go | 2 +- pkg/spi/spi_mock.go | 2 +- pkg/spi/spi_test.go | 2 +- 40 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Makefile b/Makefile index f8ac7c53a..c069499e9 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ ENVIRONMENT ?= "" ENABLE_WEBHOOKS ?= true ENABLE_WEBHOOK_HTTP2 ?=false -APPLICATION_API_CRD = https://raw.githubusercontent.com/redhat-appstudio/application-api/main/manifests/application-api-customresourcedefinitions.yaml +APPLICATION_API_CRD = https://raw.githubusercontent.com/konflux-ci/application-api/main/manifests/application-api-customresourcedefinitions.yaml # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.22 diff --git a/README.md b/README.md index b365cb80e..52ab2fc2c 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A Kubernetes operator to create, manage and control the lifecycle of applications and components. -This repository is closely associated with the [application-api](https://github.com/redhat-appstudio/application-api/) repository, which contains the Kubernetes CRD definitions for the application-service specific resources - `Application`, `Component` and `ComponentDetectionQuery`. +This repository is closely associated with the [application-api](https://github.com/konflux-ci/application-api/) repository, which contains the Kubernetes CRD definitions for the application-service specific resources - `Application`, `Component` and `ComponentDetectionQuery`. ## Documentation diff --git a/config/samples/snapshot/snapshot.yaml b/config/samples/snapshot/snapshot.yaml index 2a338f295..cdc055933 100644 --- a/config/samples/snapshot/snapshot.yaml +++ b/config/samples/snapshot/snapshot.yaml @@ -1,4 +1,4 @@ -# API type definition is in https://github.com/redhat-appstudio/application-api/tree/main/api/v1alpha1 +# API type definition is in https://github.com/konflux-ci/application-api/tree/main/api/v1alpha1 apiVersion: appstudio.redhat.com/v1alpha1 kind: Snapshot metadata: diff --git a/contracts/pact_state_handlers_methods.go b/contracts/pact_state_handlers_methods.go index 35bd24269..ddb27c4f9 100644 --- a/contracts/pact_state_handlers_methods.go +++ b/contracts/pact_state_handlers_methods.go @@ -23,10 +23,10 @@ import ( "strings" "time" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/onsi/ginkgo" gomega "github.com/onsi/gomega" models "github.com/pact-foundation/pact-go/v2/models" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" core "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/contracts/pact_utils.go b/contracts/pact_utils.go index a81578d98..c3ff6a99f 100644 --- a/contracts/pact_utils.go +++ b/contracts/pact_utils.go @@ -16,7 +16,7 @@ package contracts import ( - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/controllers/application_controller.go b/controllers/application_controller.go index a682e6296..de1607b11 100644 --- a/controllers/application_controller.go +++ b/controllers/application_controller.go @@ -46,7 +46,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" "sigs.k8s.io/yaml" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" devfile "github.com/redhat-appstudio/application-service/pkg/devfile" logutil "github.com/redhat-appstudio/application-service/pkg/log" ) diff --git a/controllers/application_controller_conditions.go b/controllers/application_controller_conditions.go index 845875beb..f39d31c25 100644 --- a/controllers/application_controller_conditions.go +++ b/controllers/application_controller_conditions.go @@ -26,7 +26,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" ) func (r *ApplicationReconciler) SetCreateConditionAndUpdateCR(ctx context.Context, req ctrl.Request, application *appstudiov1alpha1.Application, createError error) { diff --git a/controllers/application_controller_test.go b/controllers/application_controller_test.go index dc9057195..dddb2cd6c 100644 --- a/controllers/application_controller_test.go +++ b/controllers/application_controller_test.go @@ -22,9 +22,9 @@ import ( "github.com/devfile/library/v2/pkg/devfile/parser" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" cdqanalysis "github.com/redhat-appstudio/application-service/cdq-analysis/pkg" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/component_controller.go b/controllers/component_controller.go index 5a41d3453..b58829a73 100644 --- a/controllers/component_controller.go +++ b/controllers/component_controller.go @@ -50,7 +50,7 @@ import ( devfileParserUtil "github.com/devfile/library/v2/pkg/devfile/parser/util" "github.com/go-logr/logr" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" devfile "github.com/redhat-appstudio/application-service/pkg/devfile" "github.com/redhat-appstudio/application-service/pkg/github" logutil "github.com/redhat-appstudio/application-service/pkg/log" diff --git a/controllers/component_controller_conditions.go b/controllers/component_controller_conditions.go index c42126637..0eed30167 100644 --- a/controllers/component_controller_conditions.go +++ b/controllers/component_controller_conditions.go @@ -25,7 +25,7 @@ import ( "k8s.io/client-go/util/retry" ctrl "sigs.k8s.io/controller-runtime" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" logutil "github.com/redhat-appstudio/application-service/pkg/log" ) diff --git a/controllers/component_controller_test.go b/controllers/component_controller_test.go index 51cc89b7e..b0ad86d70 100644 --- a/controllers/component_controller_test.go +++ b/controllers/component_controller_test.go @@ -30,9 +30,9 @@ import ( "github.com/devfile/library/v2/pkg/devfile/parser" data "github.com/devfile/library/v2/pkg/devfile/parser/data" "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" devfilePkg "github.com/redhat-appstudio/application-service/pkg/devfile" spiapi "github.com/redhat-appstudio/service-provider-integration-operator/api/v1beta1" diff --git a/controllers/componentdetectionquery_controller.go b/controllers/componentdetectionquery_controller.go index b5348f014..6d381463f 100644 --- a/controllers/componentdetectionquery_controller.go +++ b/controllers/componentdetectionquery_controller.go @@ -27,8 +27,8 @@ import ( "github.com/go-logr/logr" "github.com/hashicorp/go-multierror" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/prometheus/client_golang/prometheus" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" cdqanalysis "github.com/redhat-appstudio/application-service/cdq-analysis/pkg" "github.com/redhat-appstudio/application-service/pkg/github" logutil "github.com/redhat-appstudio/application-service/pkg/log" diff --git a/controllers/componentdetectionquery_controller_conditions.go b/controllers/componentdetectionquery_controller_conditions.go index ea77c3f76..8fe992d6d 100644 --- a/controllers/componentdetectionquery_controller_conditions.go +++ b/controllers/componentdetectionquery_controller_conditions.go @@ -25,7 +25,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" logutil "github.com/redhat-appstudio/application-service/pkg/log" ) diff --git a/controllers/componentdetectionquery_controller_conditions_test.go b/controllers/componentdetectionquery_controller_conditions_test.go index 4f841c325..fc47e09e0 100644 --- a/controllers/componentdetectionquery_controller_conditions_test.go +++ b/controllers/componentdetectionquery_controller_conditions_test.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" ) diff --git a/controllers/componentdetectionquery_controller_test.go b/controllers/componentdetectionquery_controller_test.go index 3f17d10cd..61837d107 100644 --- a/controllers/componentdetectionquery_controller_test.go +++ b/controllers/componentdetectionquery_controller_test.go @@ -26,9 +26,9 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/redhat-appstudio/application-service/pkg/metrics" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" diff --git a/controllers/mapper.go b/controllers/mapper.go index a671aa14d..5cd385973 100644 --- a/controllers/mapper.go +++ b/controllers/mapper.go @@ -16,7 +16,7 @@ package controllers import ( - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/controllers/mapper_test.go b/controllers/mapper_test.go index 5b1f8bce2..90c82c1fe 100644 --- a/controllers/mapper_test.go +++ b/controllers/mapper_test.go @@ -19,7 +19,7 @@ import ( "context" "testing" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/start_test_env.go b/controllers/start_test_env.go index 04dbf9381..1f860199a 100644 --- a/controllers/start_test_env.go +++ b/controllers/start_test_env.go @@ -35,8 +35,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" routev1 "github.com/openshift/api/route/v1" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" github "github.com/redhat-appstudio/application-service/pkg/github" "github.com/redhat-appstudio/application-service/pkg/spi" diff --git a/controllers/update.go b/controllers/update.go index 629e70fce..686464c0d 100644 --- a/controllers/update.go +++ b/controllers/update.go @@ -31,7 +31,7 @@ import ( data "github.com/devfile/library/v2/pkg/devfile/parser/data" "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common" "github.com/go-logr/logr" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" cdqanalysis "github.com/redhat-appstudio/application-service/cdq-analysis/pkg" devfile "github.com/redhat-appstudio/application-service/pkg/devfile" "github.com/redhat-appstudio/application-service/pkg/metrics" diff --git a/controllers/update_test.go b/controllers/update_test.go index e9c33b219..51eacf3a6 100644 --- a/controllers/update_test.go +++ b/controllers/update_test.go @@ -25,8 +25,8 @@ import ( "github.com/devfile/api/v2/pkg/devfile" v2 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2" "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/prometheus/client_golang/prometheus/testutil" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" devfilePkg "github.com/redhat-appstudio/application-service/pkg/devfile" "github.com/redhat-appstudio/application-service/pkg/metrics" "github.com/stretchr/testify/assert" diff --git a/controllers/webhooks/application_webhook.go b/controllers/webhooks/application_webhook.go index e5c93d62c..b37f06d21 100644 --- a/controllers/webhooks/application_webhook.go +++ b/controllers/webhooks/application_webhook.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/go-logr/logr" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation" ctrl "sigs.k8s.io/controller-runtime" diff --git a/controllers/webhooks/application_webhook_test.go b/controllers/webhooks/application_webhook_test.go index 92eff8754..0bc7f906f 100644 --- a/controllers/webhooks/application_webhook_test.go +++ b/controllers/webhooks/application_webhook_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" //+kubebuilder:scaffold:imports diff --git a/controllers/webhooks/application_webhook_unit_test.go b/controllers/webhooks/application_webhook_unit_test.go index d4203a6c1..4e6481c6e 100644 --- a/controllers/webhooks/application_webhook_unit_test.go +++ b/controllers/webhooks/application_webhook_unit_test.go @@ -19,7 +19,7 @@ import ( "context" "testing" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" "go.uber.org/zap/zapcore" "sigs.k8s.io/controller-runtime/pkg/log/zap" diff --git a/controllers/webhooks/component_webhook.go b/controllers/webhooks/component_webhook.go index fa5771d24..95c81d714 100644 --- a/controllers/webhooks/component_webhook.go +++ b/controllers/webhooks/component_webhook.go @@ -22,7 +22,7 @@ import ( "fmt" "net/url" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/redhat-appstudio/application-service/pkg/util" "github.com/go-logr/logr" diff --git a/controllers/webhooks/component_webhook_test.go b/controllers/webhooks/component_webhook_test.go index 50779b07d..de7b49a13 100644 --- a/controllers/webhooks/component_webhook_test.go +++ b/controllers/webhooks/component_webhook_test.go @@ -24,7 +24,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/webhooks/component_webhook_unit_test.go b/controllers/webhooks/component_webhook_unit_test.go index aa72146df..97949d4ca 100644 --- a/controllers/webhooks/component_webhook_unit_test.go +++ b/controllers/webhooks/component_webhook_unit_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/redhat-appstudio/application-service/pkg/util" "go.uber.org/zap/zapcore" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/webhooks/webhook_suite_test.go b/controllers/webhooks/webhook_suite_test.go index 032423544..565ba8f1c 100644 --- a/controllers/webhooks/webhook_suite_test.go +++ b/controllers/webhooks/webhook_suite_test.go @@ -29,8 +29,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" toolkit "github.com/konflux-ci/operator-toolkit/webhook" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" admissionv1beta1 "k8s.io/api/admission/v1beta1" //+kubebuilder:scaffold:imports diff --git a/docs/serviceability.md b/docs/serviceability.md index d0891b845..0b5045474 100644 --- a/docs/serviceability.md +++ b/docs/serviceability.md @@ -47,7 +47,7 @@ For more information, on how to debug on RHTAP Staging or how to set up a debugg ## FAQs Q. Where can I view the application-service API types? -A. The application-service API types and their corresponding webhooks are defined in the [redhat-appstudio/application-api](https://github.com/redhat-appstudio/application-api) repository. You can also find the API reference information in the [Book of AppStudio](https://redhat-appstudio.github.io/architecture/ref/index.html) website. +A. The application-service API types and their corresponding webhooks are defined in the [konflux-ci/application-api](https://github.com/konflux-ci/application-api) repository. You can also find the API reference information in the [Book of AppStudio](https://redhat-appstudio.github.io/architecture/ref/index.html) website. Q. Where are the application-service controller logic located? diff --git a/gitops/generate_build.go b/gitops/generate_build.go index f0bdc62d6..56a325ff2 100644 --- a/gitops/generate_build.go +++ b/gitops/generate_build.go @@ -22,8 +22,8 @@ import ( "regexp" "strings" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" pacv1alpha1 "github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" gitopsprepare "github.com/redhat-appstudio/application-service/gitops/prepare" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/gitops/generate_build_test.go b/gitops/generate_build_test.go index 6a03ff98e..7e785b7e8 100644 --- a/gitops/generate_build_test.go +++ b/gitops/generate_build_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" pacv1alpha1 "github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" gitopsprepare "github.com/redhat-appstudio/application-service/gitops/prepare" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/gitops/prepare/prepare.go b/gitops/prepare/prepare.go index 75051bf7f..e6dc6daef 100644 --- a/gitops/prepare/prepare.go +++ b/gitops/prepare/prepare.go @@ -18,7 +18,7 @@ package prepare import ( "context" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/gitops/prepare/prepare_test.go b/gitops/prepare/prepare_test.go index 3bfa01f87..9ddad4fea 100644 --- a/gitops/prepare/prepare_test.go +++ b/gitops/prepare/prepare_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" crclient "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/go.mod b/go.mod index 0c6672bea..e859a319d 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,7 @@ require ( github.com/gofri/go-github-ratelimit v1.0.3-0.20230428184158-a500e14de53f github.com/google/go-github/v59 v59.0.0 github.com/hashicorp/go-multierror v1.1.1 + github.com/konflux-ci/application-api v0.0.0-20240527211352-be061932d497 github.com/konflux-ci/operator-toolkit v0.0.0-20240402130556-ef6dcbeca69d github.com/migueleliasweb/go-github-mock v0.0.23 github.com/onsi/ginkgo v1.16.5 @@ -18,7 +19,6 @@ require ( github.com/openshift/api v0.0.0-20220912161038-458ad9ca9ca5 github.com/pact-foundation/pact-go/v2 v2.0.0-beta.23 github.com/prometheus/client_golang v1.17.0 - github.com/redhat-appstudio/application-api v0.0.0-20240326104708-c647c0bdcda5 github.com/redhat-appstudio/application-service/cdq-analysis v0.0.0 github.com/redhat-appstudio/service-provider-integration-operator v0.2023.22-0.20230713080056-eae17aa8c172 github.com/redhat-developer/gitops-generator v0.0.0-20231030195824-c48f5bf6bf21 diff --git a/go.sum b/go.sum index 4d50035bc..b5e14d82b 100644 --- a/go.sum +++ b/go.sum @@ -554,6 +554,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +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/konflux-ci/operator-toolkit v0.0.0-20240402130556-ef6dcbeca69d h1:z7j3mglNoXvIrw5Vz/Ul+izoITRaqYURPIWrFoEyHgI= github.com/konflux-ci/operator-toolkit v0.0.0-20240402130556-ef6dcbeca69d/go.mod h1:AcChx7FjpYSIkDvQgaUKyauuF0PXm3ivB5MqZSC9Eis= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -668,8 +670,6 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/redhat-appstudio/application-api v0.0.0-20240326104708-c647c0bdcda5 h1:jhrq0LbJYYwSx2bDQVD4fUq6fj0JJSnXFsX0x1+0lm0= -github.com/redhat-appstudio/application-api v0.0.0-20240326104708-c647c0bdcda5/go.mod h1:YvckuKHe82eWloGk0/BpSw4YYG2owrGZAanztbOj3pQ= github.com/redhat-appstudio/remote-secret v0.0.0-20230713072146-a6094c712436 h1:6XYknDslXDSVpNqEKnI+gKj3Uu4afK2S+IIH3KogX1E= github.com/redhat-appstudio/remote-secret v0.0.0-20230713072146-a6094c712436/go.mod h1:QlcxNg0q63QFGr9ceI3dH7a7vO6gGh+2TJrbTiMf9DE= github.com/redhat-appstudio/service-provider-integration-operator v0.2023.22-0.20230713080056-eae17aa8c172 h1:Zibq2RBTzcoDgZcTfM5k2o1qrKuix3YPtYQ/NuP039Y= diff --git a/main.go b/main.go index 1115bfa8e..235b7a3f6 100644 --- a/main.go +++ b/main.go @@ -45,7 +45,7 @@ import ( routev1 "github.com/openshift/api/route/v1" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" cdqanalysis "github.com/redhat-appstudio/application-service/cdq-analysis/pkg" "github.com/redhat-appstudio/application-service/controllers" "github.com/redhat-appstudio/application-service/controllers/webhooks" diff --git a/pkg/devfile/devfile.go b/pkg/devfile/devfile.go index 8d9f4ff91..4ec699bb0 100644 --- a/pkg/devfile/devfile.go +++ b/pkg/devfile/devfile.go @@ -25,7 +25,7 @@ import ( "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common" cdqanalysis "github.com/redhat-appstudio/application-service/cdq-analysis/pkg" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" routev1 "github.com/openshift/api/route/v1" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/devfile/devfile_test.go b/pkg/devfile/devfile_test.go index a9adf6b99..6a08c3e12 100644 --- a/pkg/devfile/devfile_test.go +++ b/pkg/devfile/devfile_test.go @@ -24,7 +24,7 @@ import ( data "github.com/devfile/library/v2/pkg/devfile/parser/data" v2 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2" "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common" - appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + appstudiov1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/yaml" diff --git a/pkg/spi/spi.go b/pkg/spi/spi.go index 1127e7ddc..8038a24b1 100644 --- a/pkg/spi/spi.go +++ b/pkg/spi/spi.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/redhat-appstudio/application-api/api/v1alpha1" + "github.com/konflux-ci/application-api/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/go-logr/logr" diff --git a/pkg/spi/spi_mock.go b/pkg/spi/spi_mock.go index 938cd1ab9..be85466da 100644 --- a/pkg/spi/spi_mock.go +++ b/pkg/spi/spi_mock.go @@ -21,7 +21,7 @@ import ( "io" "strings" - "github.com/redhat-appstudio/application-api/api/v1alpha1" + "github.com/konflux-ci/application-api/api/v1alpha1" spiapi "github.com/redhat-appstudio/service-provider-integration-operator/api/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/spi/spi_test.go b/pkg/spi/spi_test.go index 8e5fb45d0..ede42a179 100644 --- a/pkg/spi/spi_test.go +++ b/pkg/spi/spi_test.go @@ -19,7 +19,7 @@ import ( "context" "testing" - "github.com/redhat-appstudio/application-api/api/v1alpha1" + "github.com/konflux-ci/application-api/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" )