feat: store the correct archive path

SimonRichardson · SimonRichardson · commit a20ca34bff66 · 2024-12-10T19:21:12.000Z
diff --git a/domain/application/state/application.go b/domain/application/state/application.go
@@ -1993,7 +1993,7 @@ WHERE application_uuid = $applicationID.uuid
 		return application.CharmDownloadInfo{}, internalerrors.Errorf("encoding charm uuid for %q: %w", appID, err)
 	}
 
-	provenance, err := decodeProvenance(info.DownloadProvenance)
+	provenance, err := decodeProvenance(info.Provenance)
 	if err != nil {
 		return application.CharmDownloadInfo{}, fmt.Errorf("decoding charm provenance: %w", err)
 	}
diff --git a/domain/application/state/types.go b/domain/application/state/types.go
@@ -631,19 +631,7 @@ type applicationCharmDownloadInfo struct {
 	Name               string `db:"name"`
 	Available          bool   `db:"available"`
 	Hash               string `db:"hash"`
-	DownloadProvenance string `db:"provenance"`
-	CharmhubIdentifier string `db:"charmhub_identifier"`
-	DownloadURL        string `db:"download_url"`
-	DownloadSize       int64  `db:"download_size"`
-	SourceID           int    `db:"source_id"`
-}
-
-type applicationCharmDownloadInfo struct {
-	CharmUUID          string `db:"charm_uuid"`
-	Name               string `db:"name"`
-	Available          bool   `db:"available"`
-	Hash               string `db:"hash"`
-	DownloadProvenance string `db:"provenance"`
+	Provenance         string `db:"provenance"`
 	CharmhubIdentifier string `db:"charmhub_identifier"`
 	DownloadURL        string `db:"download_url"`
 	DownloadSize       int64  `db:"download_size"`
diff --git a/internal/bootstrap/deployer.go b/internal/bootstrap/deployer.go
@@ -396,7 +396,7 @@ func (b *baseDeployer) DeployCharmhubCharm(ctx context.Context, arch string, bas
 		Charm:           result.Charm,
 		Origin:          &resolved.Origin,
 		DownloadInfo:    &downloadInfo,
-		ArchivePath:     downloadResult.Path,
+		ArchivePath:     result.ArchivePath,
 		ObjectStoreUUID: result.ObjectStoreUUID,
 	}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -1993,7 +1993,7 @@ WHERE application_uuid = $applicationID.uuid`
`1993`	`1993`	`return application.CharmDownloadInfo{}, internalerrors.Errorf("encoding charm uuid for %q: %w", appID, err)`
`1994`	`1994`	`}`
`1995`	`1995`
`1996`		`- provenance, err := decodeProvenance(info.DownloadProvenance)`
	`1996`	`+ provenance, err := decodeProvenance(info.Provenance)`
`1997`	`1997`	`if err != nil {`
`1998`	`1998`	`return application.CharmDownloadInfo{}, fmt.Errorf("decoding charm provenance: %w", err)`
`1999`	`1999`	`}`
Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ func (b *baseDeployer) DeployCharmhubCharm(ctx context.Context, arch string, bas`
`396`	`396`	`Charm: result.Charm,`
`397`	`397`	`Origin: &resolved.Origin,`
`398`	`398`	`DownloadInfo: &downloadInfo,`
`399`		`- ArchivePath: downloadResult.Path,`
	`399`	`+ ArchivePath: result.ArchivePath,`
`400`	`400`	`ObjectStoreUUID: result.ObjectStoreUUID,`
`401`	`401`	`}, nil`
`402`	`402`	`}`