Skip to content

Commit

Permalink
feat: enable cocoapods to send graphs for cli monitor
Browse files Browse the repository at this point in the history
  • Loading branch information
JCheung2004 committed Sep 20, 2024
1 parent ea78b29 commit bdee499
Show file tree
Hide file tree
Showing 23 changed files with 311 additions and 106 deletions.
26 changes: 18 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ version: 2.1
parameters:
cli_download_base_url:
type: string
default: 'https://static.snyk.io/'
default: 'https://downloads.snyk.io/'
fips_cli_download_base_url:
type: string
default: 'https://static.snyk.io/fips/'
default: 'https://downloads.snyk.io/fips/'
go_download_base_url:
type: string
default: 'https://storage.googleapis.com/golang/'
Expand Down Expand Up @@ -60,6 +60,11 @@ executors:
- image: snyklabs/cli-build-arm64:20240814-161347
working_directory: /mnt/ramdisk/snyk
resource_class: arm.large
docker-arm64-xl:
docker:
- image: snyklabs/cli-build-arm64:20240814-161347
working_directory: /mnt/ramdisk/snyk
resource_class: arm.xlarge
linux-ubuntu-mantic-amd64:
docker:
- image: ubuntu:mantic
Expand Down Expand Up @@ -105,6 +110,11 @@ executors:
# https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
xcode: '14.3.1'
resource_class: macos.m1.medium.gen1
macos-arm64-large:
macos:
# https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
xcode: '14.3.1'
resource_class: macos.m1.large.gen1
win-server2022-amd64:
machine:
image: windows-server-2022-gui:2024.01.1
Expand Down Expand Up @@ -464,7 +474,7 @@ workflows:
go_arch: amd64
go_download_base_url: << pipeline.parameters.fips_go_download_base_url >>
make_target: build clean-golang build-fips
executor: docker-amd64
executor: docker-amd64-xl
requires:
- prepare-build

Expand All @@ -475,7 +485,7 @@ workflows:
go_arch: arm64
go_download_base_url: << pipeline.parameters.fips_go_download_base_url >>
make_target: build clean-golang build-fips
executor: docker-arm64
executor: docker-arm64-xl
requires:
- prepare-build

Expand All @@ -485,7 +495,7 @@ workflows:
go_os: linux
go_arch: amd64
go_download_base_url: << pipeline.parameters.go_download_base_url >>
executor: docker-amd64
executor: docker-amd64-xl
c_compiler: /usr/bin/musl-gcc
requires:
- prepare-build
Expand All @@ -496,7 +506,7 @@ workflows:
go_os: linux
go_arch: arm64
go_download_base_url: << pipeline.parameters.go_download_base_url >>
executor: docker-arm64
executor: docker-arm64-xl
c_compiler: /usr/bin/musl-gcc
requires:
- prepare-build
Expand All @@ -507,7 +517,7 @@ workflows:
go_os: darwin
go_arch: amd64
go_download_base_url: << pipeline.parameters.go_download_base_url >>
executor: macos-arm64
executor: macos-arm64-large
install_deps_extension: macos-build
context: snyk-macos-signing
requires:
Expand All @@ -519,7 +529,7 @@ workflows:
go_os: darwin
go_arch: arm64
go_download_base_url: << pipeline.parameters.go_download_base_url >>
executor: macos-arm64
executor: macos-arm64-large
install_deps_extension: macos-build
context: snyk-macos-signing
requires:
Expand Down
4 changes: 2 additions & 2 deletions .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ignore:
SNYK-JS-LODASHSET-1320032:
- '*':
reason: No upgrade path currently available
expires: 2024-09-13T13:14:22.120Z
expires: 2024-09-30T10:00:00.000Z
created: 2023-09-13T13:14:22.120Z
'snyk:lic:npm:shescape:MPL-2.0':
- '*':
Expand All @@ -25,7 +25,7 @@ ignore:
SNYK-JS-MICROMATCH-6838728:
- '*':
reason: Direct usage within Snyk CLI are not using vulnerable function
expires: 2024-08-13T04:12:20.523Z
expires: 2024-10-13T04:12:20.523Z
created: 2024-05-14T04:12:20.531Z
patch: {}
exclude:
Expand Down
7 changes: 4 additions & 3 deletions cliv2/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ require (
github.com/snyk/cli-extension-sbom v0.0.0-20240820111700-68258cba52c7
github.com/snyk/container-cli v0.0.0-20240821111304-7ca1c415a5d7
github.com/snyk/error-catalog-golang-public v0.0.0-20240809094525-c48d19c27edb
github.com/snyk/go-application-framework v0.0.0-20240913080246-0b338561e8ee
github.com/snyk/go-application-framework v0.0.0-20240916162251-0ac46beed30a
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65
github.com/snyk/snyk-iac-capture v0.6.5
github.com/snyk/snyk-ls v0.0.0-20240903085751-fa9fa4069fc2
github.com/spf13/cobra v1.8.0
github.com/snyk/snyk-ls v0.0.0-20240916171826-f45a1a9e861a
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
)
Expand Down Expand Up @@ -170,6 +170,7 @@ require (
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/ulikunitz/xz v0.5.12 // indirect
github.com/vincent-petithory/dataurl v1.0.0 // indirect
github.com/writeas/go-strip-markdown v2.0.1+incompatible // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
Expand Down
20 changes: 11 additions & 9 deletions cliv2/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH
github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creachadair/jrpc2 v1.2.1 h1:eIgmguoqLbEjn4Pb/XYMg5U1PhVpAClGdhI/Q4gfC5o=
github.com/creachadair/jrpc2 v1.2.1/go.mod h1:RvEKAYVpDBKn3YWlTVQJIFmxG5GuLD7ztp9FMTJx8eI=
github.com/creachadair/mds v0.16.0 h1:v6DlvKXClowXFg4hkjLCR1FEFiREMf0qgX+Lm5GsEKk=
Expand Down Expand Up @@ -713,8 +713,8 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/rogpeppe/go-internal v1.12.1-0.20240709150035-ccf4b4329d21 h1:igWZJluD8KtEtAgRyF4x6lqcxDry1ULztksMJh2mnQE=
github.com/rogpeppe/go-internal v1.12.1-0.20240709150035-ccf4b4329d21/go.mod h1:RMRJLmBOqWacUkmJHRMiPKh1S1m3PA7Zh4W80/kWPpg=
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
Expand Down Expand Up @@ -747,16 +747,16 @@ github.com/snyk/container-cli v0.0.0-20240821111304-7ca1c415a5d7 h1:Zn5BcV76oFAb
github.com/snyk/container-cli v0.0.0-20240821111304-7ca1c415a5d7/go.mod h1:38w+dcAQp9eG3P5t2eNS9eG0reut10AeJjLv5lJ5lpM=
github.com/snyk/error-catalog-golang-public v0.0.0-20240809094525-c48d19c27edb h1:w9tJhpTFxWqAhLeraGsMExDjGK9x5Dwj1NRFwb+t+QE=
github.com/snyk/error-catalog-golang-public v0.0.0-20240809094525-c48d19c27edb/go.mod h1:Ytttq7Pw4vOCu9NtRQaOeDU2dhBYUyNBe6kX4+nIIQ4=
github.com/snyk/go-application-framework v0.0.0-20240913080246-0b338561e8ee h1:/O6kBSDLDsMc1he2tENvjNR8ecqwm+FmrTYl0rwnim4=
github.com/snyk/go-application-framework v0.0.0-20240913080246-0b338561e8ee/go.mod h1:zgYTVG71nX7zTb3ELeRlnwE/uKQxeOyQmAHtg6bC4uU=
github.com/snyk/go-application-framework v0.0.0-20240916162251-0ac46beed30a h1:0N+A+kBKFAZDL0QWiBnaR9G5WKm90jsq/L0T0aHcEP8=
github.com/snyk/go-application-framework v0.0.0-20240916162251-0ac46beed30a/go.mod h1:LeMsRM1FxIfO/8QpOs9V/dI46ie/RAQl02ulAh6aKys=
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65 h1:CEQuYv0Go6MEyRCD3YjLYM2u3Oxkx8GpCpFBd4rUTUk=
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65/go.mod h1:88KbbvGYlmLgee4OcQ19yr0bNpXpOr2kciOthaSzCAg=
github.com/snyk/policy-engine v0.30.11 h1:wUy5LMar2vccMbNM62MSBRdjAQAhAbIm7aNXXO+g2tk=
github.com/snyk/policy-engine v0.30.11/go.mod h1:O6nwYXbb+SNDrYVWBwkieOwVuwXNKBHuXLm//fLz9Dw=
github.com/snyk/snyk-iac-capture v0.6.5 h1:992DXCAJSN97KtUh8T5ndaWwd/6ZCal2bDkRXqM1u/E=
github.com/snyk/snyk-iac-capture v0.6.5/go.mod h1:e47i55EmM0F69ZxyFHC4sCi7vyaJW6DLoaamJJCzWGk=
github.com/snyk/snyk-ls v0.0.0-20240903085751-fa9fa4069fc2 h1:51FkGU1bVEYt2USopshLI6b9TPdPP/hqkaDoIY/NCDI=
github.com/snyk/snyk-ls v0.0.0-20240903085751-fa9fa4069fc2/go.mod h1:Z2q71ZqSmdDJq0mlIVkmquta/z0+P46yBIbmlS2p+74=
github.com/snyk/snyk-ls v0.0.0-20240916171826-f45a1a9e861a h1:q5DhB1lYHBnvZAU24mVBgjIfoCLCfiE9Ay52KOvZOvg=
github.com/snyk/snyk-ls v0.0.0-20240916171826-f45a1a9e861a/go.mod h1:CkqmVcwI/JTXiBEa6I1OWmrdpYUe+keg7nj/VE+6WK8=
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
github.com/sourcegraph/go-lsp v0.0.0-20240223163137-f80c5dd31dfd h1:Dq5WSzWsP1TbVi10zPWBI5LKEBDg4Y1OhWEph1wr5WQ=
Expand All @@ -766,8 +766,8 @@ github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
Expand Down Expand Up @@ -815,6 +815,8 @@ github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o
github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI=
github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
github.com/writeas/go-strip-markdown v2.0.1+incompatible h1:IIqxTM5Jr7RzhigcL6FkrCNfXkvbR+Nbu1ls48pXYcw=
github.com/writeas/go-strip-markdown v2.0.1+incompatible/go.mod h1:Rsyu10ZhbEK9pXdk8V6MVnZmTzRG0alMNLMwa0J01fE=
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
Expand Down
6 changes: 3 additions & 3 deletions cliv2/internal/proxy/proxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func Test_canGoThroughProxy(t *testing.T) {
proxiedClient, err := helper_getHttpClient(wp, useProxyAuth)
assert.Nil(t, err)

res, err := proxiedClient.Get("https://static.snyk.io/cli/latest/version")
res, err := proxiedClient.Get("https://downloads.snyk.io/cli/latest/version")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -148,7 +148,7 @@ func Test_proxyRejectsWithoutBasicAuthHeader(t *testing.T) {
proxiedClient, err := helper_getHttpClient(wp, useProxyAuth)
assert.Nil(t, err)

res, err := proxiedClient.Get("https://static.snyk.io/cli/latest/version")
res, err := proxiedClient.Get("https://downloads.snyk.io/cli/latest/version")
assert.Nil(t, res)
assert.NotNil(t, err)
assert.Contains(t, err.Error(), "Proxy Authentication Required")
Expand Down Expand Up @@ -264,7 +264,7 @@ func Test_proxyPropagatesAuthFailureHeader(t *testing.T) {
proxiedClient, err := helper_getHttpClient(wp, useProxyAuth)
assert.Nil(t, err)

res, err := proxiedClient.Get("https://static.snyk.io/cli/latest/version")
res, err := proxiedClient.Get("https://downloads.snyk.io/cli/latest/version")
assert.Nil(t, err)
// Assert that the proxy propagates the auth failed marker header to the response.
assert.Equal(t, res.Header.Get("snyk-auth-failed"), "true")
Expand Down
4 changes: 4 additions & 0 deletions help/cli-commands/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ Remove a config value.

Remove all config values.

### `environment`

Change the endpoint to use. Run `config environment --help` or see the [Config environment help page](https://docs.snyk.io/snyk-cli/commands/config-environment)

## Supported `<KEY>` values

### `api`
Expand Down
Loading

0 comments on commit bdee499

Please sign in to comment.