comments

ossf · Mar 18, 2022 · 0fa9c3d · 0fa9c3d
1 parent 36f28fc
commit 0fa9c3d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/cron/config/config.yaml b/cron/config/config.yaml
@@ -30,5 +30,5 @@ metric-exporter: stackdriver
 result-data-bucket-url-v2: gs://ossf-scorecard-data2
 bigquery-table-v2: scorecard-v2
 # Raw results.
-raw-result-data-bucket-url-v0: gs://ossf-scorecard-rawdata-v0
-raw-bigquery-table-v0: scorecard-rawdata-v0
+raw-result-data-bucket-url: gs://ossf-scorecard-rawdata
+raw-bigquery-table: scorecard-rawdata
diff --git a/cron/k8s/controller.release.yaml b/cron/k8s/controller.release.yaml
@@ -62,9 +62,9 @@ spec:
             # UPGRADEv2: to remove.
             - name: SCORECARD_DATA_BUCKET_URLV2
               value: "gs://ossf-scorecard-data-releasetest2"
-            # Raw results v0.
+            # Raw results.
             - name: RAW_SCORECARD_DATA_BUCKET_URL
-              value: "gs://ossf-scorecard-rawdata-releasetest-v0"
+              value: "gs://ossf-scorecard-rawdata-releasetest"
             - name: SCORECARD_SHARD_SIZE
               value: "5"
             resources:

diff --git a/cron/k8s/transfer-raw.yaml b/cron/k8s/transfer-raw.yaml
@@ -15,7 +15,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: scorecard-bq-raw-transfer-v0
+  name: scorecard-bq-raw-transfer
 spec:
   # At 02:00UTC on Monday and Thursday.
   schedule: "0 2 * * 1,4"
@@ -25,7 +25,7 @@ spec:
       template:
         spec:
           containers:
-          - name: bq-raw-transfer-v0
+          - name: bq-raw-transfer
             image: gcr.io/openssf/scorecard-bq-transfer:latest
             imagePullPolicy: Always
             resources:
@@ -35,7 +35,7 @@ spec:
                 memory: 1Gi
             env:
               - name: RAW_SCORECARD_BIGQUERY_TABLE
-                value: "scorecard-rawdata-v0"
+                value: "scorecard-rawdata"
               - name: RAW_SCORECARD_DATA_BUCKET_URL
-                value: "gs://ossf-scorecard-rawdata-v0"
+                value: "gs://ossf-scorecard-rawdata"
           restartPolicy: OnFailure
diff --git a/cron/k8s/transfer.release-raw.yaml b/cron/k8s/transfer.release-raw.yaml
@@ -15,7 +15,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: scorecard-bq-transfer-raw-releasetest-v0
+  name: scorecard-bq-transfer-raw-releasetest
 spec:
   # Daily at 9am and 6pm PST.
   schedule: "0 1,16 * * *"
@@ -26,14 +26,14 @@ spec:
         spec:
           restartPolicy: OnFailure
           containers:
-          - name: bq-transfer-raw-releasetest-v0
+          - name: bq-transfer-raw-releasetest
             image: gcr.io/openssf/scorecard-bq-transfer:latest
             imagePullPolicy: Always
             env:
             - name: RAW_SCORECARD_DATA_BUCKET_URL
-              value: "gs://ossf-scorecard-rawdata-releasetest-v0"
+              value: "gs://ossf-scorecard-rawdata-releasetest"
             - name: RAW_SCORECARD_BIGQUERY_TABLE
-              value: "scorecard_raw-releasetest-v0"
+              value: "scorecard_raw-releasetest"
             - name: SCORECARD_COMPLETION_THRESHOLD
               value: "0.9"
             resources:

diff --git a/cron/k8s/worker.release.yaml b/cron/k8s/worker.release.yaml
@@ -38,7 +38,7 @@ spec:
         - name: SCORECARD_DATA_BUCKET_URLV2
           value: "gs://ossf-scorecard-data-releasetest2"
         - name: RAW_SCORECARD_DATA_BUCKET_URL
-          value: "gs://ossf-scorecard-rawdata-releasetest-v0"
+          value: "gs://ossf-scorecard-rawdata-releasetest"
         - name: SCORECARD_REQUEST_SUBSCRIPTION_URL
           value: "gcppubsub://projects/openssf/subscriptions/scorecard-batch-worker-releasetest"
         - name: SCORECARD_BLACKLISTED_CHECKS

diff --git a/cron/worker/main.go b/cron/worker/main.go
@@ -138,7 +138,7 @@ func processRequest(ctx context.Context,
 			return fmt.Errorf("error during result.AsJSON2: %w", err)
 		}
 
-		// Raw result v0.
+		// Raw result.
 		if err := format.AsRawJSON(&result, &rawBuffer); err != nil {
 			return fmt.Errorf("error during result.AsRawJSON: %w", err)
 		}
@@ -151,7 +151,7 @@ func processRequest(ctx context.Context,
 		return fmt.Errorf("error during WriteToBlobStore2: %w", err)
 	}
 
-	// Raw result v0.
+	// Raw result.
 	if err := data.WriteToBlobStore(ctx, rawBucketURL, filename, rawBuffer.Bytes()); err != nil {
 		return fmt.Errorf("error during WriteToBlobStore2: %w", err)
 	}