Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-07-23 07:20:37 -04:00
Code Issues Projects Releases Packages Wiki Activity

CI: Use lowercase image name for fetching measurements

Browse source
This commit is contained in:
Nils Hanke 2022-10-31 12:47:31 +01:00 • committed by Nils Hanke
parent a535ca1901
commit 4d9fbdb3d3
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cli/internal/cmd/configfetchmeasurements.go
View file

@ -11,6 +11,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"net/url" "net/url"
"strings"
"time" "time"
"github.com/edgelesssys/constellation/v2/internal/config" "github.com/edgelesssys/constellation/v2/internal/config"
@ -128,7 +129,7 @@ func parseFetchMeasurementsFlags(cmd *cobra.Command) (*fetchMeasurementsFlags, e
func (f *fetchMeasurementsFlags) updateURLs(conf *config.Config) error { func (f *fetchMeasurementsFlags) updateURLs(conf *config.Config) error {
if f.measurementsURL == nil { if f.measurementsURL == nil {
parsedURL, err := url.Parse(constants.S3PublicBucket + conf.Image() + "/measurements.yaml") parsedURL, err := url.Parse(constants.S3PublicBucket + strings.ToLower(conf.Image()) + "/measurements.yaml")
if err != nil { if err != nil {
return err return err
} }
@ -136,7 +137,7 @@ func (f *fetchMeasurementsFlags) updateURLs(conf *config.Config) error {
} }
if f.signatureURL == nil { if f.signatureURL == nil {
parsedURL, err := url.Parse(constants.S3PublicBucket + conf.Image() + "/measurements.yaml.sig") parsedURL, err := url.Parse(constants.S3PublicBucket + strings.ToLower(conf.Image()) + "/measurements.yaml.sig")
if err != nil { if err != nil {
return err return err
} }

4
cli/internal/cmd/upgradeplan.go
View file

@ -181,12 +181,12 @@ func getCompatibleImages(csp cloudprovider.Provider, currentVersion string, imag
// getCompatibleImageMeasurements retrieves the expected measurements for each image. // getCompatibleImageMeasurements retrieves the expected measurements for each image.
func getCompatibleImageMeasurements(ctx context.Context, client *http.Client, rekor rekorVerifier, pubK []byte, images map[string]config.UpgradeConfig) error { func getCompatibleImageMeasurements(ctx context.Context, client *http.Client, rekor rekorVerifier, pubK []byte, images map[string]config.UpgradeConfig) error {
for idx, img := range images { for idx, img := range images {
measurementsURL, err := url.Parse(constants.S3PublicBucket + img.Image + "/measurements.yaml") measurementsURL, err := url.Parse(constants.S3PublicBucket + strings.ToLower(img.Image) + "/measurements.yaml")
if err != nil { if err != nil {
return err return err
} }
signatureURL, err := url.Parse(constants.S3PublicBucket + img.Image + "/measurements.yaml.sig") signatureURL, err := url.Parse(constants.S3PublicBucket + strings.ToLower(img.Image) + "/measurements.yaml.sig")
if err != nil { if err != nil {
return err return err
} }