From 7cd6406aef0b80a819402e631919293d5eb6adcf Mon Sep 17 00:00:00 2001 From: Azeem Shaikh Date: Sat, 24 Sep 2022 15:58:50 -0400 Subject: [PATCH] Reduce build target radius (#2293) Signed-off-by: Azeem Shaikh Signed-off-by: Azeem Shaikh --- .gitignore | 7 ++ Makefile | 102 ++++++++++++++++------ cron/internal/data/metadata.pb.go | 103 +++++++++++----------- cron/internal/data/metadata.proto | 4 +- cron/internal/data/request.pb.go | 137 +++++++++++++++--------------- cron/internal/data/request.proto | 4 +- 6 files changed, 209 insertions(+), 148 deletions(-) diff --git a/.gitignore b/.gitignore index 1a8a5cc9..8d2529c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,23 @@ # binary. scorecard +scorecard.docker +scorecard.releaser gitblobcache clients/githubrepo/roundtripper/tokens/server/github-auth-server +clients/githubrepo/roundtripper/tokens/server/github-auth-server.docker cron/internal/data/add/add cron/internal/data/validate/validate cron/internal/data/update/projects-update cron/internal/controller/controller +cron/internal/controller/controller.docker cron/internal/worker/worker cron/internal/cii/cii-worker +cron/internal/cii/cii-worker.docker cron/internal/shuffle/shuffle cron/internal/webhook/webhook +cron/internal/webhook/webhook.docker cron/internal/bq/data-transfer +cron/internal/bq/data-transfer.docker # Binaries for programs and plugins. *.exe diff --git a/Makefile b/Makefile index 454fc769..2239e04e 100644 --- a/Makefile +++ b/Makefile @@ -143,9 +143,9 @@ build: $(build-targets) build-proto: ## Compiles and generates all required protobufs build-proto: cron/internal/data/request.pb.go cron/internal/data/metadata.pb.go cron/internal/data/request.pb.go: cron/internal/data/request.proto | $(PROTOC) $(PROTOC_GEN_GO) - $(PROTOC) --plugin=$(PROTOC_GEN_GO) --go_out=../../../ cron/internal/data/request.proto + $(PROTOC) --plugin=$(PROTOC_GEN_GO) --go_out=. --go_opt=paths=source_relative cron/internal/data/request.proto cron/internal/data/metadata.pb.go: cron/internal/data/metadata.proto | $(PROTOC) $(PROTOC_GEN_GO) - $(PROTOC) --plugin=$(PROTOC_GEN_GO) --go_out=../../../ cron/internal/data/metadata.proto + $(PROTOC) --plugin=$(PROTOC_GEN_GO) --go_out=. --go_out=paths=source_relative cron/internal/data/metadata.proto generate-mocks: ## Compiles and generates all mocks using mockgen. generate-mocks: clients/mockclients/repo_client.go \ @@ -179,45 +179,107 @@ validate-docs: docs/checks/internal/generate/main.go # Validating checks.yaml go run ./docs/checks/internal/validate/main.go -build-scorecard: ## Runs go build on repo +SCORECARD_DEPS = $(shell find . -iname "*.go" | grep -v tools/ | grep -v attestor/) +build-scorecard: ## Build Scorecard CLI +build-scorecard: scorecard +scorecard: $(SCORECARD_DEPS) # Run go build and generate scorecard executable CGO_ENABLED=0 go build -trimpath -a -tags netgo -ldflags '$(LDFLAGS)' +scorecard-docker: ## Build Scorecard CLI Docker image +scorecard-docker: scorecard.docker +scorecard.docker: Dockerfile $(SCORECARD_DEPS) + DOCKER_BUILDKIT=1 docker build . --file Dockerfile \ + --tag $(IMAGE_NAME) && \ + touch scorecard.docker -build-releaser: ## Runs goreleaser on the repo +build-releaser: ## Build goreleaser for the Scorecard CLI +build-releaser: scorecard.releaser +scorecard.releaser: .goreleaser.yml $(SCORECARD_DEPS) | $(GORELEASER) # Run go releaser on the Scorecard repo - $(GORELEASER) check - VERSION_LDFLAGS="$(LDFLAGS)" $(GORELEASER) release --snapshot --rm-dist --skip-publish --skip-sign + $(GORELEASER) check && \ + VERSION_LDFLAGS="$(LDFLAGS)" $(GORELEASER) release \ + --snapshot --rm-dist --skip-publish --skip-sign && \ + touch scorecard.releaser -build-controller: ## Runs go build on the cron PubSub controller +CRON_CONTROLLER_DEPS = $(shell find cron/internal/ -iname "*.go") +build-controller: ## Build cron controller +build-controller: cron/internal/controller/controller +cron/internal/controller/controller: $(CRON_CONTROLLER_DEPS) # Run go build on the cron PubSub controller cd cron/internal/controller && CGO_ENABLED=0 go build -trimpath -a -ldflags '$(LDFLAGS)' -o controller +cron-controller-docker: ## Build cron controller Docker image +cron-controller-docker: cron/internal/controller/controller.docker +cron/internal/controller/controller.docker: cron/internal/controller/Dockerfile $(CRON_CONTROLLER_DEPS) + DOCKER_BUILDKIT=1 docker build . --file cron/internal/controller/Dockerfile \ + --tag $(IMAGE_NAME)-batch-controller \ + && touch cron/internal/controller/controller.docker build-worker: ## Runs go build on the cron PubSub worker # Run go build on the cron PubSub worker cd cron/internal/worker && CGO_ENABLED=0 go build -trimpath -a -ldflags '$(LDFLAGS)' -o worker -build-cii-worker: ## Runs go build on the CII worker +CRON_CII_DEPS = $(shell find cron/internal/ clients/ -iname "*.go") +build-cii-worker: ## Build cron CII worker +build-cii-worker: cron/internal/cii/cii-worker +cron/internal/cii/cii-worker: $(CRON_CII_DEPS) # Run go build on the CII worker cd cron/internal/cii && CGO_ENABLED=0 go build -trimpath -a -ldflags '$(LDFLAGS)' -o cii-worker +cron-cii-worker-docker: # Build cron CII worker Docker image +cron-cii-worker-docker: cron/internal/cii/cii-worker.docker +cron/internal/cii/cii-worker.docker: cron/internal/cii/Dockerfile $(CRON_CII_DEPS) + DOCKER_BUILDKIT=1 docker build . --file cron/internal/cii/Dockerfile \ + --tag $(IMAGE_NAME)-cii-worker && \ + touch cron/internal/cii/cii-worker.docker -build-shuffler: ## Runs go build on the cron shuffle script +CRON_SHUFFLER_DEPS = $(shell find cron/internal/data/ cron/internal/shuffle/ -iname "*.go") +build-shuffler: ## Build cron shuffle script +build-shuffler: cron/internal/shuffle/shuffle +cron/internal/shuffle/shuffle: $(CRON_SHUFFLER_DEPS) # Run go build on the cron shuffle script cd cron/internal/shuffle && CGO_ENABLED=0 go build -trimpath -a -ldflags '$(LDFLAGS)' -o shuffle -build-bq-transfer: ## Runs go build on the BQ transfer cron job -build-bq-transfer: ./cron/internal/bq/*.go +CRON_TRANSFER_DEPS = $(shell find cron/internal/data/ cron/internal/config/ cron/internal/bq/ -iname "*.go") +build-bq-transfer: ## Build cron BQ transfer worker +build-bq-transfer: cron/internal/bq/data-transfer +cron/internal/bq/data-transfer: $(CRON_TRANSFER_DEPS) # Run go build on the Copier cron job cd cron/internal/bq && CGO_ENABLED=0 go build -trimpath -a -ldflags '$(LDFLAGS)' -o data-transfer +cron-bq-transfer-docker: ## Build cron BQ transfer worker Docker image +cron-bq-transfer-docker: cron/internal/bq/data-transfer.docker +cron/internal/bq/data-transfer.docker: cron/internal/bq/Dockerfile $(CRON_TRANSFER_DEPS) + DOCKER_BUILDKIT=1 docker build . --file cron/internal/bq/Dockerfile \ + --tag $(IMAGE_NAME)-bq-transfer && \ + touch cron/internal/bq/data-transfer.docker -build-github-server: ## Runs go build on the GitHub auth server -build-github-server: ./clients/githubrepo/roundtripper/tokens/* +TOKEN_SERVER_DEPS = $(shell find clients/githubrepo/roundtripper/tokens/ -iname "*.go") +build-github-server: ## Build GitHub token server +build-github-server: clients/githubrepo/roundtripper/tokens/server/github-auth-server +clients/githubrepo/roundtripper/tokens/server/github-auth-server: $(TOKEN_SERVER_DEPS) # Run go build on the GitHub auth server cd clients/githubrepo/roundtripper/tokens/server && \ CGO_ENABLED=0 go build -trimpath -a -ldflags '$(LDFLAGS)' -o github-auth-server +cron-github-server-docker: ## Build GitHub token server Docker image +cron-github-server-docker: clients/githubrepo/roundtripper/tokens/server/github-auth-server.docker +clients/githubrepo/roundtripper/tokens/server/github-auth-server.docker: \ + clients/githubrepo/roundtripper/tokens/server/Dockerfile $(TOKEN_SERVER_DEPS) + DOCKER_BUILDKIT=1 docker build . \ + --file clients/githubrepo/roundtripper/tokens/server/Dockerfile \ + --tag ${IMAGE_NAME}-github-server && \ + touch clients/githubrepo/roundtripper/tokens/server/github-auth-server.docker -build-webhook: ## Runs go build on the cron webhook +CRON_WEBHOOK_DEPS = $(shell find cron/internal/webhook/ cron/internal/data/ -iname "*.go") +build-webhook: ## Build cron webhook server +build-webhook: cron/internal/webhook/webhook +cron/internal/webhook/webhook: $(CRON_WEBHOOK_DEPS) # Run go build on the cron webhook cd cron/internal/webhook && CGO_ENABLED=0 go build -trimpath -a -ldflags '$(LDFLAGS)' -o webhook +cron-webhook-docker: ## Build cron webhook server Docker image +cron-webhook-docker: cron/internal/webhook/webhook.docker +cron/internal/webhook/webhook.docker: cron/internal/webhook/Dockerfile $(CRON_WEBHOOK_DEPS) + DOCKER_BUILDKIT=1 docker build . --file cron/internal/webhook/Dockerfile \ + --tag ${IMAGE_NAME}-webhook && \ + touch cron/internal/webhook/webhook.docker + build-add-script: ## Runs go build on the add script build-add-script: cron/internal/data/add/add @@ -241,20 +303,8 @@ docker-targets = scorecard-docker cron-controller-docker cron-worker-docker cron .PHONY: dockerbuild $(docker-targets) dockerbuild: $(docker-targets) -scorecard-docker: - DOCKER_BUILDKIT=1 docker build . --file Dockerfile --tag $(IMAGE_NAME) -cron-controller-docker: - DOCKER_BUILDKIT=1 docker build . --file cron/internal/controller/Dockerfile --tag $(IMAGE_NAME)-batch-controller cron-worker-docker: DOCKER_BUILDKIT=1 docker build . --file cron/internal/worker/Dockerfile --tag $(IMAGE_NAME)-batch-worker -cron-cii-worker-docker: - DOCKER_BUILDKIT=1 docker build . --file cron/internal/cii/Dockerfile --tag $(IMAGE_NAME)-cii-worker -cron-bq-transfer-docker: - DOCKER_BUILDKIT=1 docker build . --file cron/internal/bq/Dockerfile --tag $(IMAGE_NAME)-bq-transfer -cron-webhook-docker: - DOCKER_BUILDKIT=1 docker build . --file cron/internal/webhook/Dockerfile --tag ${IMAGE_NAME}-webhook -cron-github-server-docker: - DOCKER_BUILDKIT=1 docker build . --file clients/githubrepo/roundtripper/tokens/server/Dockerfile --tag ${IMAGE_NAME}-github-server ############################################################################### ##@ Tests diff --git a/cron/internal/data/metadata.pb.go b/cron/internal/data/metadata.pb.go index c051792e..1e260e46 100644 --- a/cron/internal/data/metadata.pb.go +++ b/cron/internal/data/metadata.pb.go @@ -14,18 +14,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.17.3 -// source: cron/data/metadata.proto +// protoc-gen-go v1.28.1 +// protoc v3.21.6 +// source: cron/internal/data/metadata.proto package data import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -48,7 +47,7 @@ type ShardMetadata struct { func (x *ShardMetadata) Reset() { *x = ShardMetadata{} if protoimpl.UnsafeEnabled { - mi := &file_cron_data_metadata_proto_msgTypes[0] + mi := &file_cron_internal_data_metadata_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -61,7 +60,7 @@ func (x *ShardMetadata) String() string { func (*ShardMetadata) ProtoMessage() {} func (x *ShardMetadata) ProtoReflect() protoreflect.Message { - mi := &file_cron_data_metadata_proto_msgTypes[0] + mi := &file_cron_internal_data_metadata_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -74,7 +73,7 @@ func (x *ShardMetadata) ProtoReflect() protoreflect.Message { // Deprecated: Use ShardMetadata.ProtoReflect.Descriptor instead. func (*ShardMetadata) Descriptor() ([]byte, []int) { - return file_cron_data_metadata_proto_rawDescGZIP(), []int{0} + return file_cron_internal_data_metadata_proto_rawDescGZIP(), []int{0} } func (x *ShardMetadata) GetShardLoc() string { @@ -98,45 +97,47 @@ func (x *ShardMetadata) GetCommitSha() string { return "" } -var File_cron_data_metadata_proto protoreflect.FileDescriptor +var File_cron_internal_data_metadata_proto protoreflect.FileDescriptor -var file_cron_data_metadata_proto_rawDesc = []byte{ - 0x0a, 0x18, 0x63, 0x72, 0x6f, 0x6e, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x6d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x18, 0x6f, 0x73, 0x73, 0x66, - 0x2e, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x72, 0x64, 0x2e, 0x63, 0x72, 0x6f, 0x6e, 0x2e, - 0x64, 0x61, 0x74, 0x61, 0x22, 0xa2, 0x01, 0x0a, 0x0d, 0x53, 0x68, 0x61, 0x72, 0x64, 0x4d, 0x65, - 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x09, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, - 0x6c, 0x6f, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x08, 0x73, 0x68, 0x61, - 0x72, 0x64, 0x4c, 0x6f, 0x63, 0x88, 0x01, 0x01, 0x12, 0x20, 0x0a, 0x09, 0x6e, 0x75, 0x6d, 0x5f, - 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x08, 0x6e, - 0x75, 0x6d, 0x53, 0x68, 0x61, 0x72, 0x64, 0x88, 0x01, 0x01, 0x12, 0x22, 0x0a, 0x0a, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x73, 0x68, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, - 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x53, 0x68, 0x61, 0x88, 0x01, 0x01, 0x42, 0x0c, - 0x0a, 0x0a, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x6c, 0x6f, 0x63, 0x42, 0x0c, 0x0a, 0x0a, - 0x5f, 0x6e, 0x75, 0x6d, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, - 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x73, 0x68, 0x61, 0x42, 0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x73, 0x73, 0x66, 0x2f, 0x73, 0x63, 0x6f, - 0x72, 0x65, 0x63, 0x61, 0x72, 0x64, 0x2f, 0x63, 0x72, 0x6f, 0x6e, 0x2f, 0x64, 0x61, 0x74, 0x61, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_cron_internal_data_metadata_proto_rawDesc = []byte{ + 0x0a, 0x21, 0x63, 0x72, 0x6f, 0x6e, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, + 0x64, 0x61, 0x74, 0x61, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x6f, 0x73, 0x73, 0x66, 0x2e, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x63, + 0x61, 0x72, 0x64, 0x2e, 0x63, 0x72, 0x6f, 0x6e, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x22, 0xa2, 0x01, 0x0a, 0x0d, 0x53, 0x68, 0x61, 0x72, 0x64, + 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x09, 0x73, 0x68, 0x61, 0x72, + 0x64, 0x5f, 0x6c, 0x6f, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x08, 0x73, + 0x68, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x63, 0x88, 0x01, 0x01, 0x12, 0x20, 0x0a, 0x09, 0x6e, 0x75, + 0x6d, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, + 0x08, 0x6e, 0x75, 0x6d, 0x53, 0x68, 0x61, 0x72, 0x64, 0x88, 0x01, 0x01, 0x12, 0x22, 0x0a, 0x0a, + 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x73, 0x68, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x48, 0x02, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x53, 0x68, 0x61, 0x88, 0x01, 0x01, + 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x6c, 0x6f, 0x63, 0x42, 0x0c, + 0x0a, 0x0a, 0x5f, 0x6e, 0x75, 0x6d, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x42, 0x0d, 0x0a, 0x0b, + 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x73, 0x68, 0x61, 0x42, 0x2e, 0x5a, 0x2c, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x73, 0x73, 0x66, 0x2f, 0x73, + 0x63, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x72, 0x64, 0x2f, 0x63, 0x72, 0x6f, 0x6e, 0x2f, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( - file_cron_data_metadata_proto_rawDescOnce sync.Once - file_cron_data_metadata_proto_rawDescData = file_cron_data_metadata_proto_rawDesc + file_cron_internal_data_metadata_proto_rawDescOnce sync.Once + file_cron_internal_data_metadata_proto_rawDescData = file_cron_internal_data_metadata_proto_rawDesc ) -func file_cron_data_metadata_proto_rawDescGZIP() []byte { - file_cron_data_metadata_proto_rawDescOnce.Do(func() { - file_cron_data_metadata_proto_rawDescData = protoimpl.X.CompressGZIP(file_cron_data_metadata_proto_rawDescData) +func file_cron_internal_data_metadata_proto_rawDescGZIP() []byte { + file_cron_internal_data_metadata_proto_rawDescOnce.Do(func() { + file_cron_internal_data_metadata_proto_rawDescData = protoimpl.X.CompressGZIP(file_cron_internal_data_metadata_proto_rawDescData) }) - return file_cron_data_metadata_proto_rawDescData + return file_cron_internal_data_metadata_proto_rawDescData } -var file_cron_data_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_cron_data_metadata_proto_goTypes = []interface{}{ - (*ShardMetadata)(nil), // 0: ossf.scorecard.cron.data.ShardMetadata +var file_cron_internal_data_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_cron_internal_data_metadata_proto_goTypes = []interface{}{ + (*ShardMetadata)(nil), // 0: ossf.scorecard.cron.internal.data.ShardMetadata } -var file_cron_data_metadata_proto_depIdxs = []int32{ +var file_cron_internal_data_metadata_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -144,13 +145,13 @@ var file_cron_data_metadata_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_cron_data_metadata_proto_init() } -func file_cron_data_metadata_proto_init() { - if File_cron_data_metadata_proto != nil { +func init() { file_cron_internal_data_metadata_proto_init() } +func file_cron_internal_data_metadata_proto_init() { + if File_cron_internal_data_metadata_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_cron_data_metadata_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cron_internal_data_metadata_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ShardMetadata); i { case 0: return &v.state @@ -163,23 +164,23 @@ func file_cron_data_metadata_proto_init() { } } } - file_cron_data_metadata_proto_msgTypes[0].OneofWrappers = []interface{}{} + file_cron_internal_data_metadata_proto_msgTypes[0].OneofWrappers = []interface{}{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cron_data_metadata_proto_rawDesc, + RawDescriptor: file_cron_internal_data_metadata_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_cron_data_metadata_proto_goTypes, - DependencyIndexes: file_cron_data_metadata_proto_depIdxs, - MessageInfos: file_cron_data_metadata_proto_msgTypes, + GoTypes: file_cron_internal_data_metadata_proto_goTypes, + DependencyIndexes: file_cron_internal_data_metadata_proto_depIdxs, + MessageInfos: file_cron_internal_data_metadata_proto_msgTypes, }.Build() - File_cron_data_metadata_proto = out.File - file_cron_data_metadata_proto_rawDesc = nil - file_cron_data_metadata_proto_goTypes = nil - file_cron_data_metadata_proto_depIdxs = nil + File_cron_internal_data_metadata_proto = out.File + file_cron_internal_data_metadata_proto_rawDesc = nil + file_cron_internal_data_metadata_proto_goTypes = nil + file_cron_internal_data_metadata_proto_depIdxs = nil } diff --git a/cron/internal/data/metadata.proto b/cron/internal/data/metadata.proto index 6bf117fb..a215278d 100644 --- a/cron/internal/data/metadata.proto +++ b/cron/internal/data/metadata.proto @@ -14,9 +14,9 @@ syntax = "proto3"; -package ossf.scorecard.cron.data; +package ossf.scorecard.cron.internal.data; -option go_package = "github.com/ossf/scorecard/cron/data"; +option go_package = "github.com/ossf/scorecard/cron/internal/data"; message ShardMetadata { optional string shard_loc = 1; diff --git a/cron/internal/data/request.pb.go b/cron/internal/data/request.pb.go index b219e064..9d141fc2 100644 --- a/cron/internal/data/request.pb.go +++ b/cron/internal/data/request.pb.go @@ -14,9 +14,9 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v3.17.3 -// source: cron/data/request.proto +// protoc-gen-go v1.28.1 +// protoc v3.21.6 +// source: cron/internal/data/request.proto package data @@ -48,7 +48,7 @@ type Repo struct { func (x *Repo) Reset() { *x = Repo{} if protoimpl.UnsafeEnabled { - mi := &file_cron_data_request_proto_msgTypes[0] + mi := &file_cron_internal_data_request_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -61,7 +61,7 @@ func (x *Repo) String() string { func (*Repo) ProtoMessage() {} func (x *Repo) ProtoReflect() protoreflect.Message { - mi := &file_cron_data_request_proto_msgTypes[0] + mi := &file_cron_internal_data_request_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -74,7 +74,7 @@ func (x *Repo) ProtoReflect() protoreflect.Message { // Deprecated: Use Repo.ProtoReflect.Descriptor instead. func (*Repo) Descriptor() ([]byte, []int) { - return file_cron_data_request_proto_rawDescGZIP(), []int{0} + return file_cron_internal_data_request_proto_rawDescGZIP(), []int{0} } func (x *Repo) GetUrl() string { @@ -111,7 +111,7 @@ type ScorecardBatchRequest struct { func (x *ScorecardBatchRequest) Reset() { *x = ScorecardBatchRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cron_data_request_proto_msgTypes[1] + mi := &file_cron_internal_data_request_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -124,7 +124,7 @@ func (x *ScorecardBatchRequest) String() string { func (*ScorecardBatchRequest) ProtoMessage() {} func (x *ScorecardBatchRequest) ProtoReflect() protoreflect.Message { - mi := &file_cron_data_request_proto_msgTypes[1] + mi := &file_cron_internal_data_request_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -137,7 +137,7 @@ func (x *ScorecardBatchRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ScorecardBatchRequest.ProtoReflect.Descriptor instead. func (*ScorecardBatchRequest) Descriptor() ([]byte, []int) { - return file_cron_data_request_proto_rawDescGZIP(), []int{1} + return file_cron_internal_data_request_proto_rawDescGZIP(), []int{1} } func (x *ScorecardBatchRequest) GetRepos() []*Repo { @@ -161,60 +161,63 @@ func (x *ScorecardBatchRequest) GetJobTime() *timestamppb.Timestamp { return nil } -var File_cron_data_request_proto protoreflect.FileDescriptor +var File_cron_internal_data_request_proto protoreflect.FileDescriptor -var file_cron_data_request_proto_rawDesc = []byte{ - 0x0a, 0x17, 0x63, 0x72, 0x6f, 0x6e, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x72, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x18, 0x6f, 0x73, 0x73, 0x66, 0x2e, - 0x73, 0x63, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x72, 0x64, 0x2e, 0x63, 0x72, 0x6f, 0x6e, 0x2e, 0x64, - 0x61, 0x74, 0x61, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x69, 0x0a, 0x04, 0x52, 0x65, 0x70, 0x6f, 0x12, 0x15, 0x0a, 0x03, - 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x03, 0x75, 0x72, 0x6c, - 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x88, 0x01, 0x01, - 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x0a, 0x04, - 0x5f, 0x75, 0x72, 0x6c, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x22, - 0xcc, 0x01, 0x0a, 0x15, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x72, 0x64, 0x42, 0x61, 0x74, - 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x34, 0x0a, 0x05, 0x72, 0x65, 0x70, - 0x6f, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6f, 0x73, 0x73, 0x66, 0x2e, - 0x73, 0x63, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x72, 0x64, 0x2e, 0x63, 0x72, 0x6f, 0x6e, 0x2e, 0x64, - 0x61, 0x74, 0x61, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x52, 0x05, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x12, - 0x20, 0x0a, 0x09, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x48, 0x00, 0x52, 0x08, 0x73, 0x68, 0x61, 0x72, 0x64, 0x4e, 0x75, 0x6d, 0x88, 0x01, - 0x01, 0x12, 0x3a, 0x0a, 0x08, 0x6a, 0x6f, 0x62, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x48, - 0x01, 0x52, 0x07, 0x6a, 0x6f, 0x62, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x0c, 0x0a, - 0x0a, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x6e, 0x75, 0x6d, 0x42, 0x0b, 0x0a, 0x09, 0x5f, - 0x6a, 0x6f, 0x62, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x42, 0x25, - 0x5a, 0x23, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x73, 0x73, - 0x66, 0x2f, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x72, 0x64, 0x2f, 0x63, 0x72, 0x6f, 0x6e, - 0x2f, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_cron_internal_data_request_proto_rawDesc = []byte{ + 0x0a, 0x20, 0x63, 0x72, 0x6f, 0x6e, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, + 0x64, 0x61, 0x74, 0x61, 0x2f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x12, 0x21, 0x6f, 0x73, 0x73, 0x66, 0x2e, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x63, 0x61, + 0x72, 0x64, 0x2e, 0x63, 0x72, 0x6f, 0x6e, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x2e, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x69, 0x0a, 0x04, 0x52, 0x65, 0x70, 0x6f, 0x12, 0x15, + 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x03, 0x75, + 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x88, + 0x01, 0x01, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, + 0x0a, 0x04, 0x5f, 0x75, 0x72, 0x6c, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, + 0x74, 0x22, 0xd5, 0x01, 0x0a, 0x15, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x72, 0x64, 0x42, + 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3d, 0x0a, 0x05, 0x72, + 0x65, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x73, 0x73, + 0x66, 0x2e, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x72, 0x64, 0x2e, 0x63, 0x72, 0x6f, 0x6e, + 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x52, + 0x65, 0x70, 0x6f, 0x52, 0x05, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x20, 0x0a, 0x09, 0x73, 0x68, + 0x61, 0x72, 0x64, 0x5f, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, + 0x08, 0x73, 0x68, 0x61, 0x72, 0x64, 0x4e, 0x75, 0x6d, 0x88, 0x01, 0x01, 0x12, 0x3a, 0x0a, 0x08, + 0x6a, 0x6f, 0x62, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x48, 0x01, 0x52, 0x07, 0x6a, 0x6f, + 0x62, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x73, 0x68, 0x61, + 0x72, 0x64, 0x5f, 0x6e, 0x75, 0x6d, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x6a, 0x6f, 0x62, 0x5f, 0x74, + 0x69, 0x6d, 0x65, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x42, 0x2e, 0x5a, 0x2c, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x73, 0x73, 0x66, 0x2f, 0x73, 0x63, 0x6f, + 0x72, 0x65, 0x63, 0x61, 0x72, 0x64, 0x2f, 0x63, 0x72, 0x6f, 0x6e, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( - file_cron_data_request_proto_rawDescOnce sync.Once - file_cron_data_request_proto_rawDescData = file_cron_data_request_proto_rawDesc + file_cron_internal_data_request_proto_rawDescOnce sync.Once + file_cron_internal_data_request_proto_rawDescData = file_cron_internal_data_request_proto_rawDesc ) -func file_cron_data_request_proto_rawDescGZIP() []byte { - file_cron_data_request_proto_rawDescOnce.Do(func() { - file_cron_data_request_proto_rawDescData = protoimpl.X.CompressGZIP(file_cron_data_request_proto_rawDescData) +func file_cron_internal_data_request_proto_rawDescGZIP() []byte { + file_cron_internal_data_request_proto_rawDescOnce.Do(func() { + file_cron_internal_data_request_proto_rawDescData = protoimpl.X.CompressGZIP(file_cron_internal_data_request_proto_rawDescData) }) - return file_cron_data_request_proto_rawDescData + return file_cron_internal_data_request_proto_rawDescData } -var file_cron_data_request_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_cron_data_request_proto_goTypes = []interface{}{ - (*Repo)(nil), // 0: ossf.scorecard.cron.data.Repo - (*ScorecardBatchRequest)(nil), // 1: ossf.scorecard.cron.data.ScorecardBatchRequest +var file_cron_internal_data_request_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_cron_internal_data_request_proto_goTypes = []interface{}{ + (*Repo)(nil), // 0: ossf.scorecard.cron.internal.data.Repo + (*ScorecardBatchRequest)(nil), // 1: ossf.scorecard.cron.internal.data.ScorecardBatchRequest (*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp } -var file_cron_data_request_proto_depIdxs = []int32{ - 0, // 0: ossf.scorecard.cron.data.ScorecardBatchRequest.repos:type_name -> ossf.scorecard.cron.data.Repo - 2, // 1: ossf.scorecard.cron.data.ScorecardBatchRequest.job_time:type_name -> google.protobuf.Timestamp +var file_cron_internal_data_request_proto_depIdxs = []int32{ + 0, // 0: ossf.scorecard.cron.internal.data.ScorecardBatchRequest.repos:type_name -> ossf.scorecard.cron.internal.data.Repo + 2, // 1: ossf.scorecard.cron.internal.data.ScorecardBatchRequest.job_time:type_name -> google.protobuf.Timestamp 2, // [2:2] is the sub-list for method output_type 2, // [2:2] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name @@ -222,13 +225,13 @@ var file_cron_data_request_proto_depIdxs = []int32{ 0, // [0:2] is the sub-list for field type_name } -func init() { file_cron_data_request_proto_init() } -func file_cron_data_request_proto_init() { - if File_cron_data_request_proto != nil { +func init() { file_cron_internal_data_request_proto_init() } +func file_cron_internal_data_request_proto_init() { + if File_cron_internal_data_request_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_cron_data_request_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cron_internal_data_request_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Repo); i { case 0: return &v.state @@ -240,7 +243,7 @@ func file_cron_data_request_proto_init() { return nil } } - file_cron_data_request_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_cron_internal_data_request_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ScorecardBatchRequest); i { case 0: return &v.state @@ -253,24 +256,24 @@ func file_cron_data_request_proto_init() { } } } - file_cron_data_request_proto_msgTypes[0].OneofWrappers = []interface{}{} - file_cron_data_request_proto_msgTypes[1].OneofWrappers = []interface{}{} + file_cron_internal_data_request_proto_msgTypes[0].OneofWrappers = []interface{}{} + file_cron_internal_data_request_proto_msgTypes[1].OneofWrappers = []interface{}{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cron_data_request_proto_rawDesc, + RawDescriptor: file_cron_internal_data_request_proto_rawDesc, NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_cron_data_request_proto_goTypes, - DependencyIndexes: file_cron_data_request_proto_depIdxs, - MessageInfos: file_cron_data_request_proto_msgTypes, + GoTypes: file_cron_internal_data_request_proto_goTypes, + DependencyIndexes: file_cron_internal_data_request_proto_depIdxs, + MessageInfos: file_cron_internal_data_request_proto_msgTypes, }.Build() - File_cron_data_request_proto = out.File - file_cron_data_request_proto_rawDesc = nil - file_cron_data_request_proto_goTypes = nil - file_cron_data_request_proto_depIdxs = nil + File_cron_internal_data_request_proto = out.File + file_cron_internal_data_request_proto_rawDesc = nil + file_cron_internal_data_request_proto_goTypes = nil + file_cron_internal_data_request_proto_depIdxs = nil } diff --git a/cron/internal/data/request.proto b/cron/internal/data/request.proto index 423e21e0..8c6a7c75 100644 --- a/cron/internal/data/request.proto +++ b/cron/internal/data/request.proto @@ -14,11 +14,11 @@ syntax = "proto3"; -package ossf.scorecard.cron.data; +package ossf.scorecard.cron.internal.data; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/ossf/scorecard/cron/data"; +option go_package = "github.com/ossf/scorecard/cron/internal/data"; message Repo { optional string url = 1;