diff --git a/Makefile b/Makefile index 20c806c6..0cb9069e 100644 --- a/Makefile +++ b/Makefile @@ -167,7 +167,7 @@ kustomize: ## Download kustomize locally if necessary. ENVTEST = $(shell pwd)/bin/setup-envtest .PHONY: envtest envtest: ## Download envtest-setup locally if necessary. - $(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest) + $(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20240215143116-d0396a3d6f9f) # go-get-tool will 'go install' any package $2 and puts binary into $1. PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) diff --git a/controllers/component_build_controller_common.go b/controllers/component_build_controller_common.go index a86271fd..308f9e67 100644 --- a/controllers/component_build_controller_common.go +++ b/controllers/component_build_controller_common.go @@ -25,7 +25,7 @@ import ( "strings" appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" - "github.com/redhat-appstudio/application-service/pkg/devfile" + devfile "github.com/redhat-appstudio/application-service/cdq-analysis/pkg" buildappstudiov1alpha1 "github.com/redhat-appstudio/build-service/api/v1alpha1" "github.com/redhat-appstudio/build-service/pkg/boerrors" l "github.com/redhat-appstudio/build-service/pkg/logs" diff --git a/controllers/component_build_controller_pac.go b/controllers/component_build_controller_pac.go index 8565ae55..408af139 100644 --- a/controllers/component_build_controller_pac.go +++ b/controllers/component_build_controller_pac.go @@ -32,9 +32,9 @@ import ( pacv1alpha1 "github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1" routev1 "github.com/openshift/api/route/v1" appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + devfile "github.com/redhat-appstudio/application-service/cdq-analysis/pkg" "github.com/redhat-appstudio/application-service/gitops" gitopsprepare "github.com/redhat-appstudio/application-service/gitops/prepare" - "github.com/redhat-appstudio/application-service/pkg/devfile" "github.com/redhat-appstudio/build-service/pkg/boerrors" gp "github.com/redhat-appstudio/build-service/pkg/git/gitprovider" "github.com/redhat-appstudio/build-service/pkg/git/gitproviderfactory" diff --git a/controllers/component_build_controller_test.go b/controllers/component_build_controller_test.go index 38811254..1ee43473 100644 --- a/controllers/component_build_controller_test.go +++ b/controllers/component_build_controller_test.go @@ -39,9 +39,9 @@ import ( "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2" appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" + devfile "github.com/redhat-appstudio/application-service/cdq-analysis/pkg" "github.com/redhat-appstudio/application-service/gitops" gitopsprepare "github.com/redhat-appstudio/application-service/gitops/prepare" - "github.com/redhat-appstudio/application-service/pkg/devfile" buildappstudiov1alpha1 "github.com/redhat-appstudio/build-service/api/v1alpha1" "github.com/redhat-appstudio/build-service/pkg/boerrors" "github.com/redhat-appstudio/build-service/pkg/git/github" diff --git a/controllers/component_build_controller_unit_test.go b/controllers/component_build_controller_unit_test.go index 9b3480c8..7e0376ca 100644 --- a/controllers/component_build_controller_unit_test.go +++ b/controllers/component_build_controller_unit_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2" + devfile "github.com/redhat-appstudio/application-service/cdq-analysis/pkg" "github.com/redhat-appstudio/application-service/gitops" - "github.com/redhat-appstudio/application-service/pkg/devfile" "github.com/redhat-appstudio/build-service/pkg/boerrors" "gotest.tools/v3/assert" @@ -241,7 +241,7 @@ func TestGenerateInitialPipelineRunForComponentDevfileError(t *testing.T) { if err == nil { t.Error("generateInitialPipelineRunForComponentDevfileError(): Didn't return error") } else { - assert.ErrorContains(t, err, "failed to populateAndParseDevfile: failed to decode devfile json") + assert.ErrorContains(t, err, "invalid devfile due to error parsing devfile because of non-compliant data due to json") } } diff --git a/controllers/suite_test.go b/controllers/suite_test.go index eb2d6251..b436ebd6 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -84,7 +84,7 @@ var _ = BeforeSuite(func() { Expect(runKustomize(filepath.Join("..", "config", "crd"), crdsTempfile)).To(Succeed()) crdsTempfile.Close() - applicationServiceDepVersion := "v0.0.0-20230717184417-67d31a01a776" + applicationServiceDepVersion := "v0.0.0-20240324134056-ac595a80c5cf" applicationApiDepVersion := "v0.0.0-20231026192857-89515ad2504f" testEnv = &envtest.Environment{ CRDDirectoryPaths: []string{ diff --git a/go.mod b/go.mod index eb6508e1..9437948d 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/bradleyfalzon/ghinstallation/v2 v2.8.0 - github.com/devfile/api/v2 v2.2.1-alpha.0.20230413012049-a6c32fca0dbd + github.com/devfile/api/v2 v2.2.1 github.com/go-logr/logr v1.4.1 github.com/google/go-containerregistry v0.16.1 github.com/h2non/gock v1.2.0 @@ -27,18 +27,27 @@ require ( sigs.k8s.io/yaml v1.4.0 ) +require ( + github.com/devfile/alizer v1.2.2-0.20231004141146-f36141673c7f // indirect + github.com/distribution/distribution/v3 v3.0.0-20211118083504-a29a3c99a684 // indirect + github.com/redhat-appstudio/application-service/cdq-analysis v0.0.0 // indirect +) + // If you update dependencies below you must also update controllers/suite_test.go // Note that tekton is replaced below the require block require ( github.com/openshift-pipelines/pipelines-as-code v0.18.0 github.com/redhat-appstudio/application-api v0.0.0-20231026192857-89515ad2504f - github.com/redhat-appstudio/application-service v0.0.0-20230717184417-67d31a01a776 + github.com/redhat-appstudio/application-service v0.0.0-20240324134056-ac595a80c5cf github.com/redhat-appstudio/release-service v0.0.0-20231213200646-9aea1dba75c0 github.com/tektoncd/pipeline v0.49.0 ) replace github.com/tektoncd/pipeline v0.49.0 => github.com/tektoncd/pipeline v0.46.0 +// Without this replace go tried to lookg for the tag cdq-analysis/v0.0.0 which doesn't exist +replace github.com/redhat-appstudio/application-service/cdq-analysis v0.0.0 => github.com/redhat-appstudio/application-service/cdq-analysis v0.0.0-20240324134056-ac595a80c5cf + require ( code.gitea.io/sdk/gitea v0.15.1 // indirect contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect @@ -62,7 +71,7 @@ require ( github.com/containerd/typeurl/v2 v2.1.1 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/devfile/library/v2 v2.2.1-0.20230418160146-e75481b7eebd // indirect + github.com/devfile/library/v2 v2.2.2-0.20240108233338-2a1d045e1e65 // indirect github.com/devfile/registry-support/index/generator v0.0.0-20230123181701-4de4dadb13e7 // indirect github.com/devfile/registry-support/registry-library v0.0.0-20230123181701-4de4dadb13e7 // indirect github.com/docker/cli v24.0.4+incompatible // indirect @@ -147,15 +156,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/statsd_exporter v0.23.1 // indirect github.com/redhat-appstudio/operator-toolkit v0.0.0-20231201124606-2087182322ae // indirect - github.com/redhat-developer/alizer/go v0.0.0-20230516215932-135a2bb3fb90 // indirect - github.com/redhat-developer/gitops-generator v0.0.0-20230614175323-aff86c6bc55e // indirect + github.com/redhat-developer/gitops-generator v0.0.0-20231030195824-c48f5bf6bf21 // indirect github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect github.com/sergi/go-diff v1.3.1 // indirect github.com/shurcooL/githubv4 v0.0.0-20221229060216-a8d4a561cc93 // indirect github.com/shurcooL/graphql v0.0.0-20220606043923-3cf50f8a0a29 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/skeema/knownhosts v1.2.1 // indirect - github.com/spf13/afero v1.9.3 // indirect + github.com/spf13/afero v1.9.5 // indirect github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect github.com/stretchr/testify v1.8.4 // indirect github.com/vbatts/tar-split v0.11.3 // indirect @@ -168,7 +176,7 @@ require ( go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect - go.uber.org/atomic v1.10.0 // indirect + go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.20.0 // indirect golang.org/x/mod v0.15.0 // indirect @@ -180,7 +188,7 @@ require ( golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.18.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/api v0.126.0 // indirect + google.golang.org/api v0.130.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect @@ -194,7 +202,7 @@ require ( k8s.io/component-base v0.28.3 // indirect k8s.io/klog v1.0.0 // indirect k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect - k8s.io/pod-security-admission v0.26.1 // indirect + k8s.io/pod-security-admission v0.26.10 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect oras.land/oras-go v1.1.0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/go.sum b/go.sum index 1adc6b82..ff3d51c4 100644 --- a/go.sum +++ b/go.sum @@ -338,16 +338,18 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= +github.com/devfile/alizer v1.2.2-0.20231004141146-f36141673c7f h1:sPyzG5gLEfpns5IQiCSL4p9YpjCy2U9xu1cmKYhaHdA= +github.com/devfile/alizer v1.2.2-0.20231004141146-f36141673c7f/go.mod h1:bbmpezGJe/lSqoYcTZSHTJMQaBYapOF/OsVWsqsEcBA= github.com/devfile/api/v2 v2.0.0-20211021164004-dabee4e633ed/go.mod h1:d99eTN6QxgzihOOFyOZA+VpUyD4Q1pYRYHZ/ci9J96Q= github.com/devfile/api/v2 v2.0.0-20220117162434-6e6e6a8bc14c/go.mod h1:d99eTN6QxgzihOOFyOZA+VpUyD4Q1pYRYHZ/ci9J96Q= github.com/devfile/api/v2 v2.2.0/go.mod h1:dN7xFrOVG+iPqn4UKGibXLd5oVsdE8XyK9OEb5JL3aI= -github.com/devfile/api/v2 v2.2.1-alpha.0.20230413012049-a6c32fca0dbd h1:HpGR728CfB6BB9ZuFtQb0UeTIYNFgpuGsuoMOJNMUTM= -github.com/devfile/api/v2 v2.2.1-alpha.0.20230413012049-a6c32fca0dbd/go.mod h1:qp8jcw12y1JdCsxjK/7LJ7uWaJOxcY1s2LUk5PhbkbM= +github.com/devfile/api/v2 v2.2.1 h1:VSX297YqY4C4j4uhn7M0RdZeBaeWqyVi4NnagzEmxu0= +github.com/devfile/api/v2 v2.2.1/go.mod h1:qp8jcw12y1JdCsxjK/7LJ7uWaJOxcY1s2LUk5PhbkbM= github.com/devfile/library v1.2.1-0.20211104222135-49d635cb492f/go.mod h1:uFZZdTuRqA68FVe/JoJHP92CgINyQkyWnM2Qyiim+50= github.com/devfile/library v1.2.1-0.20220308191614-f0f7e11b17de/go.mod h1:GSPfJaBg0+bBjBHbwBE5aerJLH6tWGQu2q2rHYd9czM= github.com/devfile/library/v2 v2.0.1/go.mod h1:paJ0PARAVy0br13VpBEQ4fO3rZVDxWtooQ29+23PNBk= -github.com/devfile/library/v2 v2.2.1-0.20230418160146-e75481b7eebd h1:YHSwUdfWsG9Qk7Vn+NfafELv6+G6a43RRE/NjS0TfK0= -github.com/devfile/library/v2 v2.2.1-0.20230418160146-e75481b7eebd/go.mod h1:jXIVOBkEqh7YJddFcZ+vak47rlbCW//f+qqG5hUozhM= +github.com/devfile/library/v2 v2.2.2-0.20240108233338-2a1d045e1e65 h1:OYMj9mHRs3Sx+uSdzs8S4TYAvNJKBoBBvX+C7m224ko= +github.com/devfile/library/v2 v2.2.2-0.20240108233338-2a1d045e1e65/go.mod h1:zKKhnbSLXi8vu46c5RLr+y4kY9S9Ubi0SeCm3awndsw= github.com/devfile/registry-support/index/generator v0.0.0-20220222194908-7a90a4214f3e/go.mod h1:iRPBxs+ZjfLEduVXpCCIOzdD2588Zv9OCs/CcXMcCCY= github.com/devfile/registry-support/index/generator v0.0.0-20220527155645-8328a8a883be/go.mod h1:1fyDJL+fPHtcrYA6yjSVWeLmXmjCNth0d5Rq1rvtryc= github.com/devfile/registry-support/index/generator v0.0.0-20221018203505-df96d34d4273/go.mod h1:ZJnaSLjTKCvGJhWmYgQoQ1O3g78qBe4Va6ZugLmi4dE= @@ -1002,16 +1004,16 @@ github.com/prometheus/statsd_exporter v0.23.1/go.mod h1:FFmnBRWf+HxX+PR+2fnc0ciB github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= 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/redhat-appstudio/application-service v0.0.0-20230717184417-67d31a01a776 h1:qaNoaKn+RHg3Z3SsDYSkLEto8qlNjHJGUJ5CCMzE8gY= -github.com/redhat-appstudio/application-service v0.0.0-20230717184417-67d31a01a776/go.mod h1:meLjzNehwlqPyjd8Gg78oXRpRy5HQ4nCulk8u8mCjqs= +github.com/redhat-appstudio/application-service v0.0.0-20240324134056-ac595a80c5cf h1:jqVC/424IIjws2fGzQojCbB3wBsyMCB+STk38Crh+Tc= +github.com/redhat-appstudio/application-service v0.0.0-20240324134056-ac595a80c5cf/go.mod h1:PA9q/xsk0tLFHPdokBh3+NGiAAw9hTnd7A41B5aS0fY= +github.com/redhat-appstudio/application-service/cdq-analysis v0.0.0-20240324134056-ac595a80c5cf h1:DGSQfEf1XwegOfkosa6zMadrcrepxxKcy8YBz+OhAfY= +github.com/redhat-appstudio/application-service/cdq-analysis v0.0.0-20240324134056-ac595a80c5cf/go.mod h1:tX9brsCdcc5JPtEZgllVzfsmW3apPjLtd9BMcqUrcFU= github.com/redhat-appstudio/operator-toolkit v0.0.0-20231201124606-2087182322ae h1:98thWrMrr9YUNCVNGqkZxKfZkaWUmMC5dmkgAI7p3uY= github.com/redhat-appstudio/operator-toolkit v0.0.0-20231201124606-2087182322ae/go.mod h1:7cX2+4KGZLJ4Yoj+1v0iV5hkCGBzbSd9wkNJQjCdDJs= github.com/redhat-appstudio/release-service v0.0.0-20231213200646-9aea1dba75c0 h1:4yvI07Wt4Xjm7s9BD4g7oYYG3VSpG2+pMvWqxUM2kwk= github.com/redhat-appstudio/release-service v0.0.0-20231213200646-9aea1dba75c0/go.mod h1:lhbPcRSIvwyqDl4D86Eza1vnsD7cENkMD2IU6vcs1p0= -github.com/redhat-developer/alizer/go v0.0.0-20230516215932-135a2bb3fb90 h1:pFKn+Vqg3xXrueGboXYRkmKPJ6ObaVBNbKF1M7NG/mA= -github.com/redhat-developer/alizer/go v0.0.0-20230516215932-135a2bb3fb90/go.mod h1:y7XToX/Yq1ASZY8hatAkmXJSzEXlHZV8lf59wliUfOw= -github.com/redhat-developer/gitops-generator v0.0.0-20230614175323-aff86c6bc55e h1:YIADVYENP/Qy6XFcON9W4VMyxj1tiWYIPEtzW1DLF9A= -github.com/redhat-developer/gitops-generator v0.0.0-20230614175323-aff86c6bc55e/go.mod h1:pKJez873Y9lZwQAgm99i/y1SmPI2dMd19ID74C+CxpU= +github.com/redhat-developer/gitops-generator v0.0.0-20231030195824-c48f5bf6bf21 h1:qEcliyKbhx9bElsJXiO1yLf3hwdwmrz5z+aZRD10QRk= +github.com/redhat-developer/gitops-generator v0.0.0-20231030195824-c48f5bf6bf21/go.mod h1:2L3ozspkvZiHEvzEV5rKRnSRhU+Ox+7UT1Tz+/sTldk= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= 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= @@ -1058,8 +1060,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= -github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= @@ -1188,8 +1190,8 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= @@ -1224,9 +1226,9 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg= @@ -1623,8 +1625,8 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o= -google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= +google.golang.org/api v0.130.0 h1:A50ujooa1h9iizvfzA4rrJr2B7uRmWexwbekQ2+5FPQ= +google.golang.org/api v0.130.0/go.mod h1:J/LCJMYSDFvAVREGCbrESb53n4++NMBDetSHGL5I5RY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1855,8 +1857,8 @@ k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdi k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e h1:snPmy96t93RredGRjKfMFt+gvxuVAncqSAyBveJtr4Q= k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/pod-security-admission v0.26.1 h1:EDIxsYFeKMzNvN/JB0PgQcuwBP6fIkIG2O8ZWJhzOp4= -k8s.io/pod-security-admission v0.26.1/go.mod h1:hCbYTG5UtLlivmukkMPjAWf23PUBUHzEvR60xNVWN4c= +k8s.io/pod-security-admission v0.26.10 h1:D2MF9JbMRu3pB7Onx26DHm6MHJRh3s6ZK0UKoRRD2to= +k8s.io/pod-security-admission v0.26.10/go.mod h1:AurbRHBkqh8GSj+nDgsY0NLefkiGCmZJbzMJXQZpte8= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/pkg/pipeline-selector/pipeline_selector.go b/pkg/pipeline-selector/pipeline_selector.go index f773daee..a5560dd2 100644 --- a/pkg/pipeline-selector/pipeline_selector.go +++ b/pkg/pipeline-selector/pipeline_selector.go @@ -22,7 +22,7 @@ import ( tektonapi "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1" appstudiov1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1" - devfile "github.com/redhat-appstudio/application-service/pkg/devfile" + devfile "github.com/redhat-appstudio/application-service/cdq-analysis/pkg" buildappstudiov1alpha1 "github.com/redhat-appstudio/build-service/api/v1alpha1" "github.com/redhat-appstudio/build-service/pkg/boerrors" )