Merge branch 'main' into perm-docs

Author: naveensrinivasan

.golangci.yml

@@ -80,7 +80,10 @@ linters-settings:
       - FIXME
       - HACK
   gci:
-    local-prefixes: github.com/ossf/scorecard
+    sections:
+      - standard
+      - default
+      - prefix(github.com/ossf/scorecard)
   gocritic:
     enabled-checks:
       # Diagnostic

Makefile

@@ -12,6 +12,13 @@ IMAGE_NAME = scorecard
 OUTPUT = output
 PLATFORM="linux/amd64,linux/arm64,linux/386,linux/arm"
 LDFLAGS=$(shell ./scripts/version-ldflags)
+KOCACHE_PATH=/tmp/ko
+
+define create_kocache_path
+  mkdir -p $(KOCACHE_PATH)
+endef
+
+
 
 ############################### make help #####################################
 .PHONY: help
@@ -190,45 +197,59 @@ ko-targets = scorecard-ko cron-controller-ko cron-worker-ko cron-cii-worker-ko c
 ko-build-everything: $(ko-targets)
 
 scorecard-ko:
+	$(call create_kocache_path)
 	KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/scorecard LDFLAGS="$(LDFLAGS)" \
-	ko publish -B \
+	KO_CACHE=$(KOCACHE_PATH) ko build -B \
 			   --push=false \
+			   --sbom=none \
 			   --platform=$(PLATFORM)\
 			   --tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v4
 cron-controller-ko:
+	$(call_create_kocache_path)
 	KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-batch-controller LDFLAGS="$(LDFLAGS)" \
-	ko publish -B \
+	KOCACHE=$(KOCACHE_PATH) ko build -B \
 			   --push=false \
+			   --sbom=none \
 			   --platform=$(PLATFORM)\
 			   --tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v4/cron/controller
 cron-worker-ko:
+	$(call_create_kocache_path)
 	KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-batch-worker LDFLAGS="$(LDFLAGS)" \
-	ko publish -B \
+	KOCACHE=$(KOCACHE_PATH) ko build -B \
 			   --push=false \
+			   --sbom=none \
 			   --platform=$(PLATFORM)\
 			   --tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v4/cron/worker
 cron-cii-worker-ko:
+	$(call_create_kocache_path)
 	KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-cii-worker LDFLAGS="$(LDFLAGS)" \
-	ko publish -B \
+	KOCACHE=$(KOCACHE_PATH) ko build -B \
 			   --push=false \
+			   --sbom=none \
 			   --platform=$(PLATFORM)\
 			   --tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v4/cron/cii
 cron-bq-transfer-ko:
+	$(call_create_kocache_path)
 	KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-bq-transfer LDFLAGS="$(LDFLAGS)" \
-	ko publish -B \
+	KOCACHE=$(KOCACHE_PATH) ko build -B \
 			   --push=false \
+			   --sbom=none \
 			   --platform=$(PLATFORM)\
 			   --tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v4/cron/bq
 cron-webhook-ko:
+	$(call_create_kocache_path)
 	KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-cron-webhook LDFLAGS="$(LDFLAGS)" \
-	ko publish -B \
+	KOCACHE=$(KOCACHE_PATH) ko build -B \
 			   --push=false \
+			   --sbom=none \
 			   --platform=$(PLATFORM)\
 			   --tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v4/cron/webhook
 cron-github-server-ko:
+	$(call_create_kocache_path)
 	KO_DATA_DATE_EPOCH=$(SOURCE_DATE_EPOCH) KO_DOCKER_REPO=${KO_PREFIX}/$(IMAGE_NAME)-github-server LDFLAGS="$(LDFLAGS)" \
-	ko publish -B \
+	KOCACHE=$(KOCACHE_PATH) ko build -B \
 			   --push=false \
+			   --sbom=none \
 			   --platform=$(PLATFORM)\
 			   --tags latest,$(GIT_VERSION),$(GIT_HASH) github.com/ossf/scorecard/v4/clients/githubrepo/roundtripper/tokens/server
 

clients/cii_blob_client.go

@@ -19,7 +19,6 @@ import (
 	"fmt"
 
 	"gocloud.dev/blob"
-
 	// Needed to link GCP drivers.
 	_ "gocloud.dev/blob/gcsblob"
 )

cron/config/config.go

@@ -16,7 +16,6 @@
 package config
 
 import (
-
 	// Used to embed config.yaml.
 	_ "embed"
 	"errors"

cron/data/blob.go

@@ -23,7 +23,6 @@ import (
 	"time"
 
 	"gocloud.dev/blob"
-
 	// Needed to link in GCP drivers.
 	_ "gocloud.dev/blob/gcsblob"
 

cron/data/metadata.pb.go

@@ -18,9 +18,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-
-	// nolint:gosec
-	_ "net/http/pprof"
+	_ "net/http/pprof" // nolint:gosec
 
 	docs "github.com/ossf/scorecard/v4/docs/checks"
 	sce "github.com/ossf/scorecard/v4/errors"

cron/data/request.pb.go

@@ -24,7 +24,6 @@ import (
 	"sync/atomic"
 
 	"gocloud.dev/pubsub"
-
 	// Needed to link in GCP drivers.
 	_ "gocloud.dev/pubsub/gcppubsub"
 	"google.golang.org/protobuf/encoding/protojson"

cron/format/json.go

@@ -20,7 +20,6 @@ import (
 	"log"
 
 	"gocloud.dev/pubsub"
-
 	// Needed to link in GCP drivers.
 	_ "gocloud.dev/pubsub/gcppubsub"