fix merge

Signed-off-by: Bob Callaway <bcallaway@google.com>
sigstore · Apr 13, 2022 · 630a20b · 630a20b
2 parents a416a7f + faca7f7
commit 630a20b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/pkg/api/entries.go b/pkg/api/entries.go
@@ -112,9 +112,15 @@ func logEntryFromLeaf(ctx context.Context, signer signature.Signer, tc TrillianC
 			if err != nil {
 				log.Logger.Errorf("error fetching attestation by key, trying by UUID: %s %s", attKey, err)
 				// the original attestation implementation stored this by uuid instead of by digest
-				att, err = storageClient.FetchAttestation(ctx, uuid)
+				activeTree := fmt.Sprintf("%x", tc.logID)
+				entryIDstruct, err := sharding.CreateEntryIDFromParts(activeTree, uuid)
 				if err != nil {
-					log.Logger.Errorf("error fetching attestation by uuid: %s %s", uuid, err)
+					err := fmt.Errorf("error creating EntryID from active treeID %v and uuid %v: %w", activeTree, uuid, err)
+					return nil, err
+				}
+				att, err = storageClient.FetchAttestation(ctx, entryIDstruct.UUID)
+				if err != nil {
+					log.Logger.Errorf("error fetching attestation by uuid: %s %s", entryIDstruct.UUID, err)
 				}
 			}
 			if err == nil {
@@ -205,7 +211,15 @@ func createLogEntry(params entries.CreateLogEntryParams) (models.LogEntry, middl
 	metricNewEntries.Inc()
 
 	queuedLeaf := resp.getAddResult.QueuedLeaf.Leaf
+
 	uuid := hex.EncodeToString(queuedLeaf.GetMerkleLeafHash())
+	activeTree := fmt.Sprintf("%x", tc.logID)
+	entryIDstruct, err := sharding.CreateEntryIDFromParts(activeTree, uuid)
+	if err != nil {
+		err := fmt.Errorf("error creating EntryID from active treeID %v and uuid %v: %w", activeTree, uuid, err)
+		return nil, handleRekorAPIError(params, http.StatusInternalServerError, err, fmt.Sprintf(validationError, err))
+	}
+	entryID := entryIDstruct.ReturnEntryIDString()
 
 	// The log index should be the virtual log index across all shards
 	virtualIndex := sharding.VirtualLogIndex(queuedLeaf.LeafIndex, api.logRanges.ActiveTreeID(), api.logRanges)
@@ -224,7 +238,7 @@ func createLogEntry(params entries.CreateLogEntryParams) (models.LogEntry, middl
 				return
 			}
 			for _, key := range keys {
-				if err := addToIndex(context.Background(), key, uuid); err != nil {
+				if err := addToIndex(context.Background(), key, entryID); err != nil {
 					log.RequestIDLogger(params.HTTPRequest).Error(err)
 				}
 			}
@@ -240,9 +254,10 @@ func createLogEntry(params entries.CreateLogEntryParams) (models.LogEntry, middl
 				return
 			}
 			if err := storeAttestation(context.Background(), attKey, attVal); err != nil {
+				// entryIDstruct.UUID
 				log.RequestIDLogger(params.HTTPRequest).Errorf("error storing attestation: %s", err)
 			} else {
-				log.RequestIDLogger(params.HTTPRequest).Infof("stored attestation for uuid %s with filename %s", uuid, attKey)
+				log.RequestIDLogger(params.HTTPRequest).Infof("stored attestation for uuid %s with filename %s", entryIDstruct.UUID, attKey)
 			}
 		}()
 	}

diff --git a/release/cloudbuild.yaml b/release/cloudbuild.yaml
@@ -87,7 +87,7 @@ steps:
     - '-c'
     - |
       echo $$GITHUB_TOKEN | docker login ghcr.io -u $$GITHUB_USER --password-stdin \
-      && make copy-signed-release-to-ghcr
+      && make copy-signed-release-to-ghcr || true
 
 availableSecrets:
   secretManager:

diff --git a/tests/e2e_test.go b/tests/e2e_test.go
@@ -223,7 +223,10 @@ func TestGet(t *testing.T) {
 	out := runCli(t, "upload", "--artifact", artifactPath, "--signature", sigPath, "--public-key", pubPath)
 	outputContains(t, out, "Created entry at")
 
-	uuid := getUUIDFromUploadOutput(t, out)
+	uuid, err := sharding.GetUUIDFromIDString(getUUIDFromUploadOutput(t, out))
+	if err != nil {
+		t.Error(err)
+	}
 
 	// since we at least have 1 valid entry, check the log at index 0
 	runCli(t, "get", "--log-index", "0")