From b67874c54ced7d4b59e9cf1ff6cdbe1af116d9e5 Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Wed, 2 Aug 2023 10:43:25 +0200 Subject: [PATCH] cli: update init_test to use nodeGroups --- cli/internal/cmd/init_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cli/internal/cmd/init_test.go b/cli/internal/cmd/init_test.go index bafe7e4a7..857337f97 100644 --- a/cli/internal/cmd/init_test.go +++ b/cli/internal/cmd/init_test.go @@ -596,6 +596,7 @@ func defaultConfigWithExpectedMeasurements(t *testing.T, conf *config.Config, cs conf.Image = constants.BinaryVersion().String() conf.Name = "kubernetes" + var zone, instanceType, diskType string switch csp { case cloudprovider.Azure: conf.Provider.Azure.SubscriptionID = "01234567-0123-0123-0123-0123456789ab" @@ -606,6 +607,8 @@ func defaultConfigWithExpectedMeasurements(t *testing.T, conf *config.Config, cs conf.Attestation.AzureSEVSNP.Measurements[4] = measurements.WithAllBytes(0x44, measurements.Enforce, measurements.PCRMeasurementLength) conf.Attestation.AzureSEVSNP.Measurements[9] = measurements.WithAllBytes(0x11, measurements.Enforce, measurements.PCRMeasurementLength) conf.Attestation.AzureSEVSNP.Measurements[12] = measurements.WithAllBytes(0xcc, measurements.Enforce, measurements.PCRMeasurementLength) + instanceType = "Standard_DC4as_v5" + diskType = "StandardSSD_LRS" case cloudprovider.GCP: conf.Provider.GCP.Region = "test-region" conf.Provider.GCP.Project = "test-project" @@ -614,12 +617,22 @@ func defaultConfigWithExpectedMeasurements(t *testing.T, conf *config.Config, cs conf.Attestation.GCPSEVES.Measurements[4] = measurements.WithAllBytes(0x44, measurements.Enforce, measurements.PCRMeasurementLength) conf.Attestation.GCPSEVES.Measurements[9] = measurements.WithAllBytes(0x11, measurements.Enforce, measurements.PCRMeasurementLength) conf.Attestation.GCPSEVES.Measurements[12] = measurements.WithAllBytes(0xcc, measurements.Enforce, measurements.PCRMeasurementLength) + zone = "europe-west3-b" + instanceType = "n2d-standard-4" + diskType = "pd-ssd" case cloudprovider.QEMU: conf.Attestation.QEMUVTPM.Measurements[4] = measurements.WithAllBytes(0x44, measurements.Enforce, measurements.PCRMeasurementLength) conf.Attestation.QEMUVTPM.Measurements[9] = measurements.WithAllBytes(0x11, measurements.Enforce, measurements.PCRMeasurementLength) conf.Attestation.QEMUVTPM.Measurements[12] = measurements.WithAllBytes(0xcc, measurements.Enforce, measurements.PCRMeasurementLength) } + for groupName, group := range conf.NodeGroups { + group.Zone = zone + group.InstanceType = instanceType + group.StateDiskType = diskType + conf.NodeGroups[groupName] = group + } + conf.RemoveProviderAndAttestationExcept(csp) return conf }