fix: add remote version compatibility (chainloop-dev#1474)

Signed-off-by: Miguel Martinez <[email protected]>
jiparis · Nov 5, 2024 · bb34525 · bb34525
1 parent b12cf9a
commit bb34525
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 81 deletions.
diff --git a/app/cli/internal/action/attestation_init.go b/app/cli/internal/action/attestation_init.go
@@ -125,7 +125,7 @@ func (action *AttestationInit) Run(ctx context.Context, opts *AttestationInitRun
 		Project:        workflow.GetProject(),
 		Team:           workflow.GetTeam(),
 		SchemaRevision: strconv.Itoa(int(contractVersion.GetRevision())),
-		ProjectVersion: &clientAPI.ProjectVersion{
+		Version: &clientAPI.ProjectVersion{
 			Version:        opts.ProjectVersion,
 			MarkAsReleased: opts.ProjectVersionMarkAsReleased,
 		},
@@ -169,7 +169,7 @@ func (action *AttestationInit) Run(ctx context.Context, opts *AttestationInitRun
 		workflowRun := runResp.GetResult().GetWorkflowRun()
 		workflowMeta.WorkflowRunId = workflowRun.GetId()
 		workflowMeta.Organization = runResp.GetResult().GetOrganization()
-		workflowMeta.ProjectVersion.Prerelease = runResp.GetResult().GetWorkflowRun().Version.GetPrerelease()
+		workflowMeta.Version.Prerelease = runResp.GetResult().GetWorkflowRun().Version.GetPrerelease()
 		action.Logger.Debug().Str("workflow-run-id", workflowRun.GetId()).Msg("attestation initialized in the control plane")
 		attestationID = workflowRun.GetId()
 	}

diff --git a/app/cli/internal/action/attestation_push.go b/app/cli/internal/action/attestation_push.go
@@ -177,7 +177,7 @@ func (action *AttestationPush) Run(ctx context.Context, attestationID string, ru
 
 	workflow := crafter.CraftingState.Attestation.GetWorkflow()
 
-	attestationResult.Digest, err = pushToControlPlane(ctx, action.ActionsOpts.CPConnection, envelope, workflow.GetWorkflowRunId(), workflow.GetProjectVersion().GetMarkAsReleased())
+	attestationResult.Digest, err = pushToControlPlane(ctx, action.ActionsOpts.CPConnection, envelope, workflow.GetWorkflowRunId(), workflow.GetVersion().GetMarkAsReleased())
 	if err != nil {
 		return nil, fmt.Errorf("pushing to control plane: %w", err)
 	}

diff --git a/app/cli/internal/action/attestation_status.go b/app/cli/internal/action/attestation_status.go
@@ -104,7 +104,7 @@ func (action *AttestationStatus) Run(ctx context.Context, attestationID string)
 			Team:             workflowMeta.GetTeam(),
 			ContractRevision: workflowMeta.GetSchemaRevision(),
 			ProjectVersion: &ProjectVersion{
-				Version: workflowMeta.GetProjectVersion().GetVersion(),
+				Version: workflowMeta.GetVersion().GetVersion(),
 			},
 		},
 		InitializedAt: toTimePtr(att.InitializedAt.AsTime()),
@@ -113,8 +113,8 @@ func (action *AttestationStatus) Run(ctx context.Context, attestationID string)
 	}
 
 	if !action.skipReleaseInfo {
-		res.WorkflowMeta.ProjectVersion.Prerelease = workflowMeta.ProjectVersion.Prerelease
-		res.WorkflowMeta.ProjectVersion.MarkAsReleased = workflowMeta.ProjectVersion.MarkAsReleased
+		res.WorkflowMeta.ProjectVersion.Prerelease = workflowMeta.Version.Prerelease
+		res.WorkflowMeta.ProjectVersion.MarkAsReleased = workflowMeta.Version.MarkAsReleased
 	}
 
 	// Let's perform the following steps in order to show all possible materials:

diff --git a/app/controlplane/api/gen/frontend/attestation/v1/crafting_state.ts b/app/controlplane/api/gen/frontend/attestation/v1/crafting_state.ts
diff --git a/app/controlplane/api/gen/jsonschema/attestation.v1.WorkflowMetadata.jsonschema.json b/app/controlplane/api/gen/jsonschema/attestation.v1.WorkflowMetadata.jsonschema.json
diff --git a/app/controlplane/api/gen/jsonschema/attestation.v1.WorkflowMetadata.schema.json b/app/controlplane/api/gen/jsonschema/attestation.v1.WorkflowMetadata.schema.json