Skip to content

Commit

Permalink
🎉 v10 🎉 (#2966)
Browse files Browse the repository at this point in the history
* 🛑 remove v9 from ID of providers

We don't want it in the ID, since they have a separate version info.
Having the ID in the name makes it much trickier to update a provider
(technically).

* 🧹 remove leftover _motor files from v9 migration

Signed-off-by: Dominik Richter <[email protected]>

* 🌟 v10 bump

Signed-off-by: Dominik Richter <[email protected]>

* 🟢 remove unused tracer

Signed-off-by: Dominik Richter <[email protected]>

* 🟢 lint line length in proto

Signed-off-by: Dominik Richter <[email protected]>

* 🧹 update generated files

* 🧹 fix spelling in makefile

* 🧹 use list of cross-connection provider

* make network provider backwards-compatible

* 🧹 remove k8s.kubelet alias

* 🧹 update provider ids in recordings

---------

Signed-off-by: Dominik Richter <[email protected]>
Co-authored-by: Christoph Hartmann <[email protected]>
  • Loading branch information
arlimus and chris-rock authored Jan 14, 2024
1 parent 66df730 commit 3e502d0
Show file tree
Hide file tree
Showing 1,038 changed files with 2,969 additions and 13,763 deletions.
6 changes: 3 additions & 3 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ builds:
- -tags="production netgo"
ldflags:
- "-extldflags=-static"
- -s -w -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}}
- -s -w -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}}
- id: macos
main: ./apps/cnquery/cnquery.go
binary: cnquery
Expand All @@ -41,7 +41,7 @@ builds:
flags: -tags production
ldflags:
# clang + macos does not support static: - -extldflags "-static"
- -s -w -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}}
- -s -w -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}}
hooks:
post:
- cmd: /tmp/quill sign-and-notarize "{{ .Path }}" -vv || true
Expand All @@ -59,7 +59,7 @@ builds:
flags: -tags production -buildmode exe
ldflags:
- "-extldflags -static"
- -s -w -X go.mondoo.com/cnquery/v9.Version={{.Version}} -X go.mondoo.com/cnquery/v9.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v9.Date={{.Date}}
- -s -w -X go.mondoo.com/cnquery/v10.Version={{.Version}} -X go.mondoo.com/cnquery/v10.Build={{.ShortCommit}} -X go.mondoo.com/cnquery/v10.Date={{.Date}}
hooks:
post:
- cmd: jsign --storetype DIGICERTONE --alias "{{ .Env.SM_CERT_ALIAS }}" --storepass "{{ .Env.SM_API_KEY }}|{{ .Env.SM_CLIENT_CERT_FILE}}|{{ .Env.SM_CLIENT_CERT_PASSWORD }}" --tsaurl "http://timestamp.digicert.com" '{{ .Path }}'
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ ifeq ($(TARGETOS),windows)
BIN_SUFFIX=".exe"
endif

LDFLAGS=-ldflags "-s -w -X go.mondoo.com/cnquery/v9.Version=${VERSION} -X go.mondoo.com/cnquery/v9.Build=${TAG}" # -linkmode external -extldflags=-static
LDFLAGSDIST=-tags production -ldflags "-s -w -X go.mondoo.com/cnquery/v9.Version=${LATEST_VERSION_TAG} -X go.mondoo.com/cnquery/v9.Build=${TAG} -s -w"
LDFLAGS=-ldflags "-s -w -X go.mondoo.com/cnquery/v10.Version=${VERSION} -X go.mondoo.com/cnquery/v10.Build=${TAG}" # -linkmode external -extldflags=-static
LDFLAGSDIST=-tags production -ldflags "-s -w -X go.mondoo.com/cnquery/v10.Version=${LATEST_VERSION_TAG} -X go.mondoo.com/cnquery/v10.Build=${TAG} -s -w"

.PHONY: info/ldflags
info/ldflags:
Expand All @@ -56,7 +56,7 @@ prep/tools/windows:


prep/tools/protolint:
# protobuf lintingng
# protobuf linting
go install github.com/yoheimuta/protolint/cmd/protolint@latest

prep/tools: prep/tools/protolint
Expand Down
10 changes: 0 additions & 10 deletions _motor/discovery/common/context.go

This file was deleted.

31 changes: 0 additions & 31 deletions _motor/discovery/common/credentials.go

This file was deleted.

11 changes: 0 additions & 11 deletions _motor/discovery/common/labels.go

This file was deleted.

43 changes: 0 additions & 43 deletions _motor/discovery/common/projectname.go

This file was deleted.

24 changes: 0 additions & 24 deletions _motor/discovery/common/projectname_test.go

This file was deleted.

76 changes: 0 additions & 76 deletions _motor/discovery/gcp/instancesnapshot/resolver.go

This file was deleted.

117 changes: 0 additions & 117 deletions _motor/discovery/gcp/resolver_folder.go

This file was deleted.

Loading

0 comments on commit 3e502d0

Please sign in to comment.