Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2024-10-01 01:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename in config: PCRs->Measurements

Browse Source 
Signed-off-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
Daniel Weiße 2022-05-06 16:10:35 +02:00 committed by Daniel Weiße
parent 3318126363
commit a953df60b6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/cloud/cloudcmd/validators.go
View File

@ -68,13 +68,13 @@ func (v *Validators) updatePCR(pcrIndex uint32, encoded string) error {
func (v *Validators) setPCRs(config *config.Config) error { func (v *Validators) setPCRs(config *config.Config) error {
switch v.provider { switch v.provider {
case cloudprovider.GCP: case cloudprovider.GCP:
gcpPCRs := *config.Provider.GCP.PCRs gcpPCRs := *config.Provider.GCP.Measurements
if err := v.checkPCRs(gcpPCRs); err != nil { if err := v.checkPCRs(gcpPCRs); err != nil {
return err return err
} }
v.pcrs = gcpPCRs v.pcrs = gcpPCRs
case cloudprovider.Azure: case cloudprovider.Azure:
azurePCRs := *config.Provider.Azure.PCRs azurePCRs := *config.Provider.Azure.Measurements
if err := v.checkPCRs(azurePCRs); err != nil { if err := v.checkPCRs(azurePCRs); err != nil {
return err return err
} }

4
cli/cloud/cloudcmd/validators_test.go
View File

@ -68,10 +68,10 @@ func TestNewValidators(t *testing.T) {
conf := &config.Config{Provider: &config.ProviderConfig{}} conf := &config.Config{Provider: &config.ProviderConfig{}}
if tc.provider == cloudprovider.GCP { if tc.provider == cloudprovider.GCP {
conf.Provider.GCP = &config.GCPConfig{PCRs: &tc.pcrs} conf.Provider.GCP = &config.GCPConfig{Measurements: &tc.pcrs}
} }
if tc.provider == cloudprovider.Azure { if tc.provider == cloudprovider.Azure {
conf.Provider.Azure = &config.AzureConfig{PCRs: &tc.pcrs} conf.Provider.Azure = &config.AzureConfig{Measurements: &tc.pcrs}
} }
if tc.provider == cloudprovider.QEMU { if tc.provider == cloudprovider.QEMU {
conf.Provider.QEMU = &config.QEMUConfig{PCRs: &tc.pcrs} conf.Provider.QEMU = &config.QEMUConfig{PCRs: &tc.pcrs}

8
internal/config/config.go
View File

@ -148,7 +148,7 @@ func Default() *Config {
}, },
}, },
}, },
PCRs: pcrPtr(azurePCRs), Measurements: pcrPtr(azurePCRs),
UserAssignedIdentity: proto.String("/subscriptions/0d202bbb-4fa7-4af8-8125-58c269a05435/resourceGroups/constellation-images/providers/Microsoft.ManagedIdentity/userAssignedIdentities/constellation-dev-identity"), UserAssignedIdentity: proto.String("/subscriptions/0d202bbb-4fa7-4af8-8125-58c269a05435/resourceGroups/constellation-images/providers/Microsoft.ManagedIdentity/userAssignedIdentities/constellation-dev-identity"),
}, },
GCP: &GCPConfig{ GCP: &GCPConfig{
@ -196,7 +196,7 @@ func Default() *Config {
"roles/storage.admin", "roles/storage.admin",
"roles/iam.serviceAccountUser", "roles/iam.serviceAccountUser",
}, },
PCRs: pcrPtr(gcpPCRs), Measurements: pcrPtr(gcpPCRs),
}, },
QEMU: &QEMUConfig{ QEMU: &QEMUConfig{
PCRs: pcrPtr(qemuPCRs), PCRs: pcrPtr(qemuPCRs),
@ -241,7 +241,7 @@ type AzureConfig struct {
Location *string `json:"location,omitempty"` // TODO: This will be user input Location *string `json:"location,omitempty"` // TODO: This will be user input
Image *string `json:"image,omitempty"` Image *string `json:"image,omitempty"`
NetworkSecurityGroupInput *azureClient.NetworkSecurityGroupInput `json:"networksecuritygroupinput,omitempty"` NetworkSecurityGroupInput *azureClient.NetworkSecurityGroupInput `json:"networksecuritygroupinput,omitempty"`
PCRs *map[uint32][]byte `json:"pcrs,omitempty"` Measurements *map[uint32][]byte `json:"measurements,omitempty"`
UserAssignedIdentity *string `json:"userassignedidentity,omitempty"` UserAssignedIdentity *string `json:"userassignedidentity,omitempty"`
} }
@ -254,7 +254,7 @@ type GCPConfig struct {
FirewallInput *gcpClient.FirewallInput `json:"firewallinput,omitempty"` FirewallInput *gcpClient.FirewallInput `json:"firewallinput,omitempty"`
VPCsInput *gcpClient.VPCsInput `json:"vpcsinput,omitempty"` VPCsInput *gcpClient.VPCsInput `json:"vpcsinput,omitempty"`
ServiceAccountRoles *[]string `json:"serviceaccountroles,omitempty"` ServiceAccountRoles *[]string `json:"serviceaccountroles,omitempty"`
PCRs *map[uint32][]byte `json:"pcrs,omitempty"` Measurements *map[uint32][]byte `json:"measurements,omitempty"`
} }
type QEMUConfig struct { type QEMUConfig struct {