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

Devfile registry telemetry integration #5101

Merged
merged 4 commits into from
Oct 5, 2021
Merged

Devfile registry telemetry integration #5101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a314fa
feat: devfile registry telemetry
GeekArthur Sep 29, 2021
130d764
Merge branch 'main' of github.com:openshift/odo into telemetry
GeekArthur Sep 29, 2021
3931faa
fix: resolve conflict issue
GeekArthur Sep 29, 2021
a35d72d
refactor: centralize consts
GeekArthur Sep 30, 2021
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
28 changes: 13 additions & 15 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,28 @@ require (
github.com/Xuanwo/go-locale v1.0.0
github.com/blang/semver v3.5.1+incompatible
github.com/devfile/api/v2 v2.1.0
github.com/devfile/library v1.0.1-0.20210716161803-9de9d4cb6be7
github.com/devfile/registry-support/index/generator v0.0.0-20210407161420-cd279527f873
github.com/devfile/registry-support/registry-library v0.0.0-20210407161420-cd279527f873
github.com/devfile/library v1.1.1-0.20210910214722-7c5ff63711ec
github.com/devfile/registry-support/index/generator v0.0.0-20210916150157-08b31e03fdf0
github.com/devfile/registry-support/registry-library v0.0.0-20210928163805-b0916a4f1aca
github.com/fatih/color v1.10.0
github.com/frapposelli/wwhrd v0.4.0
github.com/fsnotify/fsnotify v1.4.9
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-git/go-git/v5 v5.2.0
github.com/go-openapi/spec v0.19.4
github.com/go-openapi/spec v0.19.5
github.com/go-openapi/strfmt v0.19.3
github.com/go-openapi/validate v0.19.5
github.com/gobwas/glob v0.2.3
github.com/golang/mock v1.5.0
github.com/google/go-cmp v0.5.4 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c
github.com/kubernetes-sigs/service-catalog v0.3.1
github.com/kylelemons/godebug v1.1.0
github.com/mattn/go-colorable v0.1.8
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/olekukonko/tablewriter v0.0.5
github.com/onsi/ginkgo v1.16.1
github.com/onsi/gomega v1.11.0
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.14.0
github.com/openshift/api v0.0.0-20201216151826-78a19e96f9eb
github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49
github.com/openshift/library-go v0.0.0-20210106214821-c4d0b9c8d55f
Expand All @@ -49,23 +47,21 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
github.com/tidwall/gjson v1.7.5
github.com/tidwall/sjson v1.1.6 // indirect
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
github.com/zalando/go-keyring v0.1.1
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
golang.org/x/term v0.0.0-20210317153231-de623e64d2a6
golang.org/x/tools v0.1.2-0.20210512205948-8287d5da45e4 // indirect
gopkg.in/AlecAivazis/survey.v1 v1.8.8
gopkg.in/segmentio/analytics-go.v3 v3.1.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.20.1
k8s.io/apimachinery v0.20.1
k8s.io/api v0.21.3
k8s.io/apimachinery v0.21.3
k8s.io/cli-runtime v0.20.1
k8s.io/client-go v0.20.1
k8s.io/client-go v0.21.3
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.4.0
k8s.io/klog/v2 v2.8.0
k8s.io/kubectl v0.20.1
sigs.k8s.io/controller-runtime v0.7.0
sigs.k8s.io/controller-runtime v0.9.5
sigs.k8s.io/yaml v1.2.0

)
Expand All @@ -76,8 +72,10 @@ replace (
github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b
github.com/containers/image => github.com/openshift/containers-image v0.0.0-20190130162819-76de87591e9d
github.com/docker/docker => github.com/docker/docker v1.4.2-0.20191121165722-d1d5f6476656
k8s.io/api => k8s.io/api v0.20.1
k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20210108114224-194a87c5b03a
k8s.io/cli-runtime => github.com/openshift/kubernetes-cli-runtime v0.0.0-20210108114725-2ff6add1e911
k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20210108114446-0829bdd68114
k8s.io/kubectl => github.com/openshift/kubernetes-kubectl v0.0.0-20210108115031-c0d78c0aeda3
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.7.0
)
105 changes: 56 additions & 49 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pkg/catalog/catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (

indexSchema "github.com/devfile/registry-support/index/generator/schema"
registryLibrary "github.com/devfile/registry-support/registry-library/library"
registryConsts "github.com/openshift/odo/pkg/odo/cli/registry/consts"
registryUtil "github.com/openshift/odo/pkg/odo/cli/registry/util"
"github.com/openshift/odo/pkg/util"
olm "github.com/operator-framework/api/pkg/operators/v1alpha1"
Expand Down Expand Up @@ -172,7 +173,7 @@ func getRegistryDevfiles(registry Registry) (registryDevfiles []DevfileComponent
}
} else {
// OCI-based registry
devfileIndex, err = registryLibrary.GetRegistryStacks(registry.URL)
devfileIndex, err = registryLibrary.GetRegistryIndex(registry.URL, false, registryConsts.TelemetryClient, indexSchema.StackDevfileType)
if err != nil {
return nil, err
}
Expand Down
5 changes: 3 additions & 2 deletions pkg/odo/cli/component/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
appCmd "github.com/openshift/odo/pkg/odo/cli/application"
"github.com/openshift/odo/pkg/odo/cli/component/ui"
projectCmd "github.com/openshift/odo/pkg/odo/cli/project"
registryConsts "github.com/openshift/odo/pkg/odo/cli/registry/consts"
registryUtil "github.com/openshift/odo/pkg/odo/cli/registry/util"
"github.com/openshift/odo/pkg/odo/genericclioptions"
odoutil "github.com/openshift/odo/pkg/odo/util"
Expand Down Expand Up @@ -497,7 +498,7 @@ func (co *CreateOptions) devfileRun(cmd *cobra.Command) (err error) {
params.Token = token
}
} else {
err = registryLibrary.PullStackFromRegistry(co.devfileMetadata.devfileRegistry.URL, co.devfileMetadata.componentType, co.componentContext)
err = registryLibrary.PullStackFromRegistry(co.devfileMetadata.devfileRegistry.URL, co.devfileMetadata.componentType, co.componentContext, false, registryConsts.TelemetryClient)
if err != nil {
return err
}
Expand Down Expand Up @@ -564,7 +565,7 @@ func (co *CreateOptions) devfileRun(cmd *cobra.Command) (err error) {
return errors.Wrapf(err, "unable to save devfile to %s", DevfilePath)
}
if co.devfileMetadata.devfilePath.value == "" && !devfileExist && !strings.Contains(co.devfileMetadata.devfileRegistry.URL, "github") {
err = registryLibrary.PullStackFromRegistry(co.devfileMetadata.devfileRegistry.URL, co.devfileMetadata.componentType, co.componentContext)
err = registryLibrary.PullStackFromRegistry(co.devfileMetadata.devfileRegistry.URL, co.devfileMetadata.componentType, co.componentContext, false, registryConsts.TelemetryClient)
if err != nil {
return err
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/odo/cli/registry/consts/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package consts

const (
TelemetryClient = "odo"
)
18 changes: 13 additions & 5 deletions vendor/github.com/devfile/library/pkg/devfile/parser/data/v2/2.2.0/devfileJsonSchema220.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 9 additions & 18 deletions vendor/github.com/devfile/library/pkg/devfile/validate/validate.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 36 additions & 1 deletion vendor/github.com/devfile/registry-support/index/generator/schema/schema.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading